commit 93cf2529304f205b728a89fee40dfbd7d507a361
author Nathan Chancellor <natechancellor@gmail.com> Wed Apr 17 10:52:26 2019 -0700
committer Nathan Chancellor <natechancellor@gmail.com> Wed Apr 17 11:07:27 2019 -0700
tree aa864b6a10c8631c0fa560bb8c4c87c02de9a922
parent fe293dc2ab3c17ebcb3e135649d415ed02cc05c3

ANDROID: Makefile: Properly resolve 4.14.112 merge

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

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

Change-Id: I72b7f69204a801ff6ef6405e24317a7b08428901
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>

Makefile

diff --git a/Makefile b/Makefile
index 07e03e9..ea37f94 100644
--- a/Makefile
+++ b/Makefile
@@ -480,7 +480,8 @@
 
 ifeq ($(cc-name),clang)
 ifneq ($(CROSS_COMPILE),)
-CLANG_FLAGS	:= --target=$(notdir $(CROSS_COMPILE:%-=%))
+CLANG_TRIPLE	?= $(CROSS_COMPILE)
+CLANG_FLAGS	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))
 GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
 CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)
 GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)