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

Commit 4ceafbb5 authored by Alistair Strachan's avatar Alistair Strachan
Browse files

Fix merge issue from 4.14.85. 



In d11d7f1c ("Merge 4.14.85 into android-4.14"), the changes for
9d844b0e ("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: default avatarAlistair Strachan <astrachan@google.com>
parent 23bc5181

Makefile

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