diff options
| author | Mike Frysinger <vapier@google.com> | 2016-02-05 13:21:45 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@google.com> | 2016-02-05 13:21:45 -0500 |
| commit | 3c13bf176ea4d46ac29a7d6525aca47ac6d27128 (patch) | |
| tree | a4ca459543bfcc5c5540acea59925536b051ec87 | |
| parent | 746c7df47e10abad4bd1cb7f9e5bc694de2d34de (diff) | |
| download | integration-3c13bf176ea4d46ac29a7d6525aca47ac6d27128.tar.gz | |
toolchain: include TARGET_GLOBAL_CFLAGS in wrappers
Some flags we want to use everywhere and the build puts those into the
TARGET_GLOBAL_CFLAGS variable. These are things like stack-protector
and -D__BRILLO__ (which can in turn affect some bionic headers).
BUG=b:26861037
TEST=building python for arm/x86 works now
Change-Id: I46c617d2a27bc1dfbce9775e744e23a61871ef02
| -rw-r--r-- | toolchain/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/toolchain/Android.mk b/toolchain/Android.mk index 8602138..7716705 100644 --- a/toolchain/Android.mk +++ b/toolchain/Android.mk @@ -16,7 +16,7 @@ $(compiler): $(LOCAL_PATH)/$(LOCAL_MODULE).in | $(3RD_PARTY_SYSTEM_DEPS) $(hide)mkdir -p $(dir $@) $(hide)sed \ -e 's:@CC@:$(notdir $(TARGET_CC)):' \ - -e 's:@CFLAGS@:$(foreach p,$(TARGET_C_INCLUDES) $(EXTERNAL_PACKAGES_INCLUDE),-isystem "$${ANDROID_BUILD_TOP}/$(p)"):' \ + -e 's:@CFLAGS@:$(foreach p,$(TARGET_C_INCLUDES) $(EXTERNAL_PACKAGES_INCLUDE),-isystem "$${ANDROID_BUILD_TOP}/$(p)") $(filter-out -Werror=%,$(TARGET_GLOBAL_CFLAGS)):' \ -e 's:@LDFLAGS@:-B"$(patsubst $(PRODUCT_OUT)/%,$${ANDROID_PRODUCT_OUT}/%,$(TARGET_OUT_INTERMEDIATE_LIBRARIES))":' \ -e 's:@ROOT_SUBDIR@:$(3RD_PARTY_ROOT_SUBDIR):g' \ -e 's:@LIBDIR@:$(3RD_PARTY_LIBDIR):g' \ @@ -41,8 +41,7 @@ $(compiler): $(LOCAL_PATH)/$(LOCAL_MODULE).in | $(3RD_PARTY_SYSTEM_DEPS) $(hide)mkdir -p $(dir $@) $(hide)sed \ -e 's:@CXX@:$(notdir $(TARGET_CXX)):' \ - -e 's:@CXXFLAGS@:$(foreach p,$(TARGET_C_INCLUDES) external/libcxx/include external/libcxxabi/include,-isystem "$${ANDROID_BUILD_TOP}/$(p)"):' \ - -e 's:@CFLAGS@:$(foreach p,$(TARGET_C_INCLUDES),-isystem "$${ANDROID_BUILD_TOP}/$(p)"):' \ + -e 's:@CXXFLAGS@:$(foreach p,$(TARGET_C_INCLUDES) external/libcxx/include external/libcxxabi/include,-isystem "$${ANDROID_BUILD_TOP}/$(p)") $(filter-out -Werror=%,$(TARGET_GLOBAL_CFLAGS)):' \ -e 's:@LDFLAGS@:-B"$(patsubst $(PRODUCT_OUT)/%,$${ANDROID_PRODUCT_OUT}/%,$(TARGET_OUT_INTERMEDIATE_LIBRARIES))":' \ -e 's:@ROOT_SUBDIR@:$(3RD_PARTY_ROOT_SUBDIR):g' \ -e 's:@LIBDIR@:$(3RD_PARTY_LIBDIR):g' \ |