diff options
| author | Mike Frysinger <vapier@google.com> | 2015-10-09 14:27:40 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2015-10-09 14:32:57 -0400 |
| commit | ba029f6bf802b0988cd58819be36a9e44e2bedb5 (patch) | |
| tree | ce729e5922152514b2cfa7e4989e373abdcb67cd | |
| parent | cbaefc0ed41d7665dab9d062af3236c423c44033 (diff) | |
| download | integration-ba029f6bf802b0988cd58819be36a9e44e2bedb5.tar.gz | |
rename 3RD_PARTY_COMPILER to 3RD_PARTY_CC
Since we'll have a 3RD_PARTY_CXX setting, it doesn't make sense to have
a 3RD_PARTY_COMPILER variable anymore. Rename it everywhere.
We also drop it from the emerge deps as it's redundant -- it's already
listed in the 3RD_PARTY_WRAPPERS variable.
BUG=24803386
TEST=emerge glog/gflags works
Change-Id: Iea28b0668c043701b249e9a649a7f20ed6d92348
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | portage/Android.mk | 2 | ||||
| -rw-r--r-- | toolchain/Android.mk | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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-gcc +3RD_PARTY_CC := $(HOST_OUT_EXECUTABLES)/3rd-party-gcc 3RD_PARTY_PKG_CONFIG := $(HOST_OUT_EXECUTABLES)/3rd-party-pkg-config TARGET_OUT_GENTOO := $(TARGET_OUT_INTERMEDIATES)/gentoo @@ -18,7 +18,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: | $(3RD_PARTY_COMPILER) $(3RD_PARTY_WRAPPERS) $(3RD_PARTY_CONFIGS) +%.emerge: | $(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/portage/Android.mk b/portage/Android.mk index 5a62a7a..a24768a 100644 --- a/portage/Android.mk +++ b/portage/Android.mk @@ -53,7 +53,7 @@ make.conf := $(intermediates)/make.conf $(make.conf): $(LOCAL_PATH)/make.conf.in $(make.profile) $(hide)mkdir -p $(dir $@) $(hide)sed \ - -e 's:@CC@:$(notdir $(3RD_PARTY_COMPILER)):g' \ + -e 's:@CC@:$(notdir $(3RD_PARTY_CC)):g' \ -e 's:@CXX@:$(notdir $(TARGET_CXX)):g' \ -e 's:@AR@:$(notdir $(TARGET_AR)):g' \ -e 's:@RANLIB@:$(notdir $(TARGET_RANLIB)):g' \ diff --git a/toolchain/Android.mk b/toolchain/Android.mk index d9fb138..e0c46fb 100644 --- a/toolchain/Android.mk +++ b/toolchain/Android.mk @@ -20,7 +20,7 @@ $(compiler): $(LOCAL_PATH)/$(LOCAL_MODULE).in && chmod a+rx $@.tmp && mv $@.tmp $@ LOCAL_BUILT_MODULE = $(compiler) -LOCAL_GENERATED_SOURCES += $(3RD_PARTY_COMPILER) +LOCAL_GENERATED_SOURCES += $(3RD_PARTY_CC) 3RD_PARTY_WRAPPERS += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) |