diff options
| author | Stephen Hines <srhines@google.com> | 2014-02-13 03:21:12 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-02-13 09:24:29 -0800 |
| commit | 6d5dd2367ae19357a92e545652c10ba02928b103 (patch) | |
| tree | fb034e8b65462a12adf33c68645091bff0536282 /core | |
| parent | 5c7039fb069c040759df0a5a15241dd7f8b2f9b7 (diff) | |
| download | build-6d5dd2367ae19357a92e545652c10ba02928b103.zip build-6d5dd2367ae19357a92e545652c10ba02928b103.tar.gz build-6d5dd2367ae19357a92e545652c10ba02928b103.tar.bz2 | |
Fix incorrect x86 build rules.
combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their
linker command lines. This results in clang builds not working properly,
since they strip some unknown flags from TARGET_GLOBAL_CFLAGS.
Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
Diffstat (limited to 'core')
| -rw-r--r-- | core/clang/TARGET_x86.mk | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | core/combo/TARGET_linux-x86.mk | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | core/combo/TARGET_linux-x86_64.mk | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk index 0f530b5..70cb252 100644 --- a/core/clang/TARGET_x86.mk +++ b/core/clang/TARGET_x86.mk @@ -2,6 +2,8 @@ include $(BUILD_SYSTEM)/clang/x86.mk CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android +# NOTE: There is no i686-linux-android prebuilt, so we must hardcode the +# x86_64 target instead. CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \ $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 801f882..baf4f3f 100755..100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -182,7 +182,6 @@ $(hide) $(PRIVATE_CXX) \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ -nostdlib -Wl,-soname,$(notdir $@) \ -shared -Bsymbolic \ - $(TARGET_GLOBAL_CFLAGS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(PRIVATE_ALL_OBJECTS) \ diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 6a29762..1d73a62 100755..100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -188,7 +188,6 @@ $(hide) $(PRIVATE_CXX) \ $(PRIVATE_TARGET_GLOBAL_LDFLAGS) \ -nostdlib -Wl,-soname,$(notdir $@) \ -shared -Bsymbolic \ - $(TARGET_GLOBAL_CFLAGS) \ $(PRIVATE_TARGET_GLOBAL_LD_DIRS) \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \ $(PRIVATE_ALL_OBJECTS) \ |