diff options
| author | Mike Frysinger <vapier@google.com> | 2015-10-08 15:57:11 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2015-10-08 16:18:01 -0400 |
| commit | abe64e04627fb9849fd94dab76920296b5198013 (patch) | |
| tree | bef6d351e3f63f6d99871eefb1246f5a10ba5761 | |
| parent | 2cb3832ce7082e5392acfd35919ad3517776dbe4 (diff) | |
| download | integration-abe64e04627fb9849fd94dab76920296b5198013.tar.gz | |
toolchain: rename 3rd-party-compiler to 3rd-party-gcc
Some build systems are stupid and look for "gcc" in the compiler name.
Rename the wrapper to "3rd-party-gcc" to avoid those bugs.
Change-Id: Ied37ccdb94faadd5585c2e1f82659cf4a19e6a24
| -rw-r--r-- | 3rd-party-binary.mk | 2 | ||||
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | toolchain/3rd-party-gcc.in (renamed from toolchain/3rd-party-compiler.in) | 0 | ||||
| -rw-r--r-- | toolchain/Android.mk | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/3rd-party-binary.mk b/3rd-party-binary.mk index 76a4902..880e4b8 100644 --- a/3rd-party-binary.mk +++ b/3rd-party-binary.mk @@ -1,4 +1,4 @@ -LOCAL_CC := $(HOST_OUT_EXECUTABLES)/3rd-party-compiler +LOCAL_CC := $(HOST_OUT_EXECUTABLES)/3rd-party-gcc LOCAL_CXX := $(LOCAL_CC) LOCAL_ADDITIONAL_DEPENDENCIES := 3rd-party-packages @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir) # Only load these subdirs when 3rd party packages have been requested. ifneq ($(PRODUCT_3RD_PARTY_PACKAGES),) -3RD_PARTY_COMPILER = $(HOST_OUT_EXECUTABLES)/3rd-party-compiler +3RD_PARTY_COMPILER := $(HOST_OUT_EXECUTABLES)/3rd-party-gcc TARGET_OUT_GENTOO := $(TARGET_OUT_INTERMEDIATES)/gentoo TARGET_OUT_COMMON_GENTOO := $(TARGET_OUT_COMMON_INTERMEDIATES)/gentoo @@ -15,7 +15,7 @@ include $(call all-subdir-makefiles) # Actually run the emerge command for the specific package. %.emerge: TARGET_TO_ATOM = $(notdir $(patsubst %/,%,$(dir $(1))))/$(notdir $(1:.emerge=)) -%.emerge: | $(HOST_OUT_EXECUTABLES)/3rd-party-compiler $(3RD_PARTY_WRAPPERS) $(3RD_PARTY_CONFIGS) +%.emerge: | $(3RD_PARTY_COMPILER) $(3RD_PARTY_WRAPPERS) $(3RD_PARTY_CONFIGS) $(hide)mkdir -p $(dir $@) $(TARGET_OUT_GENTOO)/tmp $(hide)emerge $(call TARGET_TO_ATOM,$@) $(hide)3rd-party-merge \ diff --git a/toolchain/3rd-party-compiler.in b/toolchain/3rd-party-gcc.in index ef8e708..ef8e708 100644 --- a/toolchain/3rd-party-compiler.in +++ b/toolchain/3rd-party-gcc.in diff --git a/toolchain/Android.mk b/toolchain/Android.mk index 2e40683..28872d4 100644 --- a/toolchain/Android.mk +++ b/toolchain/Android.mk @@ -1,14 +1,14 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -LOCAL_MODULE := 3rd-party-compiler +LOCAL_MODULE := 3rd-party-gcc LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_IS_HOST_MODULE := true include $(BUILD_SYSTEM)/base_rules.mk compiler = $(intermediates)/$(LOCAL_MODULE) -$(compiler): $(LOCAL_PATH)/3rd-party-compiler.in +$(compiler): $(LOCAL_PATH)/$(LOCAL_MODULE).in @mkdir -p $(dir $@) $(hide): $(PRODUCT_OUT) $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(hide)sed \ |