Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b6268054 authored by Nathan Chancellor's avatar Nathan Chancellor
Browse files

Makefile: Properly resolve conflict from 4.9.145 



Commit 4c219af4 ("kbuild: allow to use GCC toolchain not in Clang
search path") was not fully applied because of a conflict with commit
4dcb0afd ("ANDROID: Kbuild, LLVMLinux: allow overriding clang target
triple").

Change-Id: Ifbea30c010fb44decff10dd3d565eebfbfcbb005
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
parent e9a34dce

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -517,7 +517,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)