commit 87485dbe777b1114409acb43210000524ca01d15
author Alistair Strachan <astrachan@google.com> Fri Nov 09 10:26:38 2018 -0800
committer Alistair Strachan <astrachan@google.com> Fri Nov 09 10:27:22 2018 -0800
tree ad95800b9cec79cc70b997a5dc22251a8b275cd8
parent 2de3f80d5ba260199c92a6ab0ada08daa2ce54ae

Revert "ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple"

This reverts commit b9b964626ea839d4a93a47625c74d29a67aa926e.

We will apply a better version backported from experimental/android-4.19.

Change-Id: I62b9d7bf6cee3aac63758fbad35d68bf9b6c01d4
Signed-off-by: Alistair Strachan <astrachan@google.com>

Makefile

diff --git a/Makefile b/Makefile
index ec567bc2..497685c 100644
--- a/Makefile
+++ b/Makefile
@@ -480,8 +480,7 @@
 
 ifeq ($(cc-name),clang)
 ifneq ($(CROSS_COMPILE),)
-CLANG_TRIPLE	?= $(CROSS_COMPILE)
-CLANG_TARGET	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))
+CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))
 GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)
 endif
 ifneq ($(GCC_TOOLCHAIN),)