diff options
author | Nick Desaulniers <ndesaulniers@google.com> | 2019-02-11 14:30:04 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-02-19 19:42:31 -0500 |
commit | ad15006cc78459d059af56729c4d9bed7c7fd860 (patch) | |
tree | 27ab315142f2eaea28c979cf507dbdded1564a88 /Makefile | |
parent | 1e88e415ebccb9013b92b55e7512938040c53b61 (diff) |
kbuild: clang: choose GCC_TOOLCHAIN_DIR not on LD
This causes an issue when trying to build with `make LD=ld.lld` if
ld.lld and the rest of your cross tools aren't in the same directory
(ex. /usr/local/bin) (as is the case for Android's build system), as the
GCC_TOOLCHAIN_DIR then gets set based on `which $(LD)` which will point
where LLVM tools are, not GCC/binutils tools are located.
Instead, select the GCC_TOOLCHAIN_DIR based on another tool provided by
binutils for which LLVM does not provide a substitute for, such as
elfedit.
Fixes: 785f11aa595b ("kbuild: Add better clang cross build support")
Link: https://github.com/ClangBuiltLinux/linux/issues/341
Suggested-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -495,7 +495,7 @@ endif | |||
495 | ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) | 495 | ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) |
496 | ifneq ($(CROSS_COMPILE),) | 496 | ifneq ($(CROSS_COMPILE),) |
497 | CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) | 497 | CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) |
498 | GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD))) | 498 | GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit)) |
499 | CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR) | 499 | CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR) |
500 | GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) | 500 | GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) |
501 | endif | 501 | endif |