commit b318f050f354bd051eabe4700db5001510592095
author Alistair Strachan <astrachan@google.com> Tue May 14 17:23:12 2019 -0700
committer Alistair Strachan <astrachan@google.com> Tue May 14 17:23:56 2019 -0700
tree 80700da807204c4c200dd4b3e692f341c5f57235
parent 23562ad35ac78de12d362bbf3f3ebcda52bf0478

Merge fixes for android-mainline

This should fix builds with clang.

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

Makefile

diff --git a/Makefile b/Makefile
index 0e28562..c363e15 100644
--- a/Makefile
+++ b/Makefile
@@ -506,12 +506,12 @@
 ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)
 ifneq ($(CROSS_COMPILE),)
 CLANG_TRIPLE	?= $(CROSS_COMPILE)
-CLANG_TARGET	:= --target=$(notdir $(CLANG_TRIPLE:%-=%))
-ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_TARGET)), y)
+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 $(LD)))
-CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)
+GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit))
+CLANG_FLAGS	+= --prefix=$(GCC_TOOLCHAIN_DIR)
 GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)
 endif
 ifneq ($(GCC_TOOLCHAIN),)