| From ecae2c3a3b4856074259a78d27c5fc13fdfa21b0 Mon Sep 17 00:00:00 2001 |
| From: Nick Desaulniers <ndesaulniers@google.com> |
| Date: Mon, 11 Feb 2019 11:30:04 -0800 |
| Subject: kbuild: clang: choose GCC_TOOLCHAIN_DIR not on LD |
| |
| [ Upstream commit ad15006cc78459d059af56729c4d9bed7c7fd860 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/Makefile b/Makefile |
| index af99c77c7066..be885715f83f 100644 |
| --- a/Makefile |
| +++ b/Makefile |
| @@ -510,7 +510,7 @@ endif |
| ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) |
| ifneq ($(CROSS_COMPILE),) |
| CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) |
| -GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD))) |
| +GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit)) |
| CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR) |
| GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) |
| endif |
| -- |
| 2.19.1 |
| |
