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

Commit 1b103290 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Alistair Strachan
Browse files

ANDROID: Makefile: Properly resolve 4.19.35 merge 



The merge removed commit 4c451dba ("ANDROID: Kbuild, LLVMLinux:
allow overriding clang target triple").

This keeps commit f66a52d9 ("kbuild: clang: choose GCC_TOOLCHAIN_DIR
not on LD"), which caused the conflict.

Change-Id: I72b7f69204a801ff6ef6405e24317a7b08428901
Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
parent 68e9a46b

Makefile

+5 −1
Original line number Diff line number Diff line
@@ -482,7 +482,11 @@ endif 


ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_FLAGS	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

CLANG_TRIPLE	?= $(CROSS_COMPILE)

CLANG_FLAGS	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))

ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)

$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")

endif

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))

CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)