summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Strachan <alistair.strachan@imgtec.com>2016-05-05 16:29:08 -0700
committerSteve Kondik <shade@chemlab.org>2016-05-13 21:15:59 -0700
commitef1f045521a07a2901529b76a20575aff5769e60 (patch)
treeee869c6f1def5c7032b29f1ce86c0391ea14a203
parent624ba2e5b510f024c2a2243f2c780085da6c7502 (diff)
downloadbuild-ef1f045521a07a2901529b76a20575aff5769e60.zip
build-ef1f045521a07a2901529b76a20575aff5769e60.tar.gz
build-ef1f045521a07a2901529b76a20575aff5769e60.tar.bz2
Avoid accidentally using the host's native 'as' command.
When invoking clang for the host to assemble .S files, the -B flag would not be provided, which allowed the host prebuilt clang to use an 'as' from the native environment. Most of the time this "just works", but some newer 'as' versions cause problems with the older prebuilt toolchain, for example by generating unsupported relocation types. To avoid this problem, simply use the -B flag to tell clang to invoke the assembler from the correct prebuilt gcc prefix. Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342 Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
-rw-r--r--core/clang/HOST_x86_common.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/clang/HOST_x86_common.mk b/core/clang/HOST_x86_common.mk
index 74b5a69..7b3d6b5 100644
--- a/core/clang/HOST_x86_common.mk
+++ b/core/clang/HOST_x86_common.mk
@@ -11,7 +11,8 @@ endif
ifeq ($(HOST_OS),linux)
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \
- --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot
+ --sysroot=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
+ -B$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin
CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)
@@ -51,4 +52,4 @@ endif # Linux
ifeq ($(HOST_OS),windows)
# nothing required here yet
-endif
+endif \ No newline at end of file