From 4ceafbb5cc3df7390bd3255cfe8fec6f4271dcbb Mon Sep 17 00:00:00 2001 From: Alistair Strachan Date: Fri, 7 Dec 2018 15:36:53 -0800 Subject: [PATCH] Fix merge issue from 4.14.85. In d11d7f1ccfb1 ("Merge 4.14.85 into android-4.14"), the changes for 9d844b0e6692 ("kbuild: allow to use GCC toolchain not in Clang search path") were not merged in. Restore the needed bits. Change-Id: Ib3c3ae91d5b82b736499052a53f0de2b246027fa Signed-off-by: Alistair Strachan --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8787400b021b..e479314fed78 100644 --- a/Makefile +++ b/Makefile @@ -485,7 +485,9 @@ CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%)) ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y) $(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?") endif -GCC_TOOLCHAIN := $(realpath $(dir $(shell which $(LD)))/..) +GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD))) +CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR) +GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) endif ifneq ($(GCC_TOOLCHAIN),) CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN) -- 2.20.1