Unverified Commit 441e77e2 authored Jan 14, 2019 by Nathan Chancellor

Makefile: Fix 4.14.93 resolution



Commit ff858d82 ("kbuild: consolidate Clang compiler flags")
conflicts with commit b9b96462 ("ANDROID: Kbuild, LLVMLinux: allow
overriding clang target triple"). Remove the extra definition of
CLANG_FLAGS and rename CLANG_TARGET to CLANG_FLAGS as a proper
resolution.

As it currently stands, CLANG_FLAGS will not have the proper target when
cross compiling for aarch64-linux-android.

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

parent ca784704

Makefile

+1 −2

Original line number	Diff line number	Diff line
		@@ -481,8 +481,7 @@ endif
		ifeq ($(cc-name),clang)
		ifneq ($(CROSS_COMPILE),)
		CLANG_TRIPLE ?= $(CROSS_COMPILE)
		CLANG_TARGET := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))
		CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)