Merge "kbuild: initialize CLANG_FLAGS correctly in the top Makefile" (f54719f7) · Commits · e / devices / android_kernel_sony_msm8998

Makefile

+8 −8

Original line number	Diff line number	Diff line
		@@ -408,6 +408,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE)
		KBUILD_AFLAGS_MODULE := -DMODULE
		KBUILD_CFLAGS_MODULE := -DMODULE
		KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
		CLANG_FLAGS :=

		# Read KERNELRELEASE from include/config/kernel.release (if it exists)
		KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)
		@@ -618,21 +619,20 @@ all: vmlinux
		ifeq ($(cc-name),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 $(CROSS_COMPILE)elfedit))
		CLANG_PREFIX := --prefix=$(GCC_TOOLCHAIN_DIR)
		CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)
		GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..)
		endif
		ifneq ($(GCC_TOOLCHAIN),)
		CLANG_GCC_TC := --gcc-toolchain=$(GCC_TOOLCHAIN)
		CLANG_FLAGS += --gcc-toolchain=$(GCC_TOOLCHAIN)
		endif
		KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
		KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)
		KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)
		KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)
		CLANG_FLAGS += -no-integrated-as
		KBUILD_CFLAGS += $(CLANG_FLAGS)
		KBUILD_AFLAGS += $(CLANG_FLAGS)
		endif

		# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default