diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-03-21 21:05:45 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-23 14:47:00 -0700 |
| commit | dfde360b2cd2b409ffd9f077f2756ce070972116 (patch) | |
| tree | 796ea030618a8edca2b8adc6dbbe393e5a018ccd /core/combo | |
| parent | 871bc703e57d5b7629c043a54f5ac2614a17981b (diff) | |
| download | build-dfde360b2cd2b409ffd9f077f2756ce070972116.zip build-dfde360b2cd2b409ffd9f077f2756ce070972116.tar.gz build-dfde360b2cd2b409ffd9f077f2756ce070972116.tar.bz2 | |
Switch to new host prebuilt x86_64-linux-glibc2.11-4.6
Change-Id: I763398d523bf4851a13722f72b12ec69d7a4bb4f
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 3c87264..85d536b 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -22,10 +22,8 @@ define get-file-size stat --format "%s" "$(1)" | tr -d '\n' endef -# Previously the prebiult host toolchain is used only for the sdk build, -# that's why we have "sdk" in the path name. ifeq ($(strip $(HOST_TOOLCHAIN_PREFIX)),) -HOST_TOOLCHAIN_PREFIX := prebuilts/tools/gcc-sdk/ +HOST_TOOLCHAIN_PREFIX := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/bin/x86_64-linux- endif # Don't do anything if the toolchain is not there ifneq (,$(strip $(wildcard $(HOST_TOOLCHAIN_PREFIX)gcc))) @@ -34,6 +32,7 @@ HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)g++ HOST_AR := $(HOST_TOOLCHAIN_PREFIX)ar endif # $(HOST_TOOLCHAIN_PREFIX)gcc exists +HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6/ ifneq ($(strip $(BUILD_HOST_64bit)),) # By default we build everything in 32-bit, because it gives us # more consistency between the host tools and the target. @@ -41,14 +40,10 @@ ifneq ($(strip $(BUILD_HOST_64bit)),) # which can benefit from 64-bit host arch. HOST_GLOBAL_CFLAGS += -m64 -Wa,--noexecstack HOST_GLOBAL_LDFLAGS += -m64 -Wl,-z,noexecstack -# gcc location for clang; to be updated when clang is updated -HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6/ else # We expect SSE3 floating point math. HOST_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32 -Wa,--noexecstack HOST_GLOBAL_LDFLAGS += -m32 -Wl,-z,noexecstack -# gcc location for clang; to be updated when clang is updated -HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/i686-linux-glibc2.7-4.6/ endif # BUILD_HOST_64bit ifneq ($(strip $(BUILD_HOST_static)),) |