diff options
| author | Tim Murray <timmurray@google.com> | 2014-03-25 21:22:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 21:22:55 +0000 |
| commit | 1bbba7d404f024e243e5d3fa8f19a53ba61586a5 (patch) | |
| tree | a2b1bf28fe29736cb8775a3b19276389d3b9935c /core/combo | |
| parent | 9b269f228c0a635778d403f4b92559da46c08bd2 (diff) | |
| parent | 9c08a73b242344a18676a2c5b17f5d475abef16f (diff) | |
| download | build-1bbba7d404f024e243e5d3fa8f19a53ba61586a5.zip build-1bbba7d404f024e243e5d3fa8f19a53ba61586a5.tar.gz build-1bbba7d404f024e243e5d3fa8f19a53ba61586a5.tar.bz2 | |
am 9c08a73b: am 6440fb0c: am b35094ec: am 01aa01db: Merge "Make Clang host builds hermetic on Linux."
* commit '9c08a73b242344a18676a2c5b17f5d475abef16f':
Make Clang host builds hermetic on Linux.
Diffstat (limited to 'core/combo')
| -rw-r--r-- | core/combo/HOST_darwin-x86.mk | 4 | ||||
| -rw-r--r-- | core/combo/HOST_linux-x86.mk | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk index 037dee6..994196a 100644 --- a/core/combo/HOST_darwin-x86.mk +++ b/core/combo/HOST_darwin-x86.mk @@ -156,3 +156,7 @@ endef define get-file-size stat -f "%z" $(1) endef + +# gcc location for clang; to be updated when clang is updated +# HOST_TOOLCHAIN_ROOT is a Darwin-specific define +HOST_TOOLCHAIN_FOR_CLANG := $(HOST_TOOLCHAIN_ROOT)
\ No newline at end of file diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 129acb0..3c87264 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -41,10 +41,14 @@ 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)),) |