diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2022-09-02 02:04:03 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2022-09-02 02:04:03 +0800 |
| commit | d3edb6607719fae62f2b16e9ef640587cab79899 (patch) | |
| tree | 1bc0e19c78841d6ccea9a6653dca5f23265b38f8 | |
| parent | 24e62489abec3dc8c92f13ce15e05667aae3a6f0 (diff) | |
Revert "kernelscripts: define CC variable."
* Pass both variables simultaneously instead.
This reverts commit 63901b118b1bf8bd37f14db4c6e649043b7b31ae.
Change-Id: Ibfee7c6590e3154f4582bc86467049beb79993df
| -rw-r--r-- | kernel_definitions.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/kernel_definitions.mk b/kernel_definitions.mk index a5ccfa9..d2e4ffa 100644 --- a/kernel_definitions.mk +++ b/kernel_definitions.mk @@ -99,11 +99,10 @@ KERNEL_GCC_NOANDROID_CHK := $(shell (echo "int main() {return 0;}" | $(KERNEL_CR ifeq ($(KERNEL_ARCH),arm64) CLANG_ARCH := aarch64-linux-gnu- else -CLANG_ARCH := arm-linux-gnueabi +CLANG_ARCH := arm-linux-gnueabi- endif -cc := -real_cc := +cc_args := ifeq ($(KERNEL_LLVM_SUPPORT),true) ifeq ($(KERNEL_SD_LLVM_SUPPORT), true) #Using sd-llvm compiler ifeq ($(shell echo $(SDCLANG_PATH) | head -c 1),/) @@ -121,8 +120,7 @@ ifeq ($(KERNEL_LLVM_SUPPORT),true) $(warning "Not using latest aosp-llvm" $(KERNEL_LLVM_BIN)/clang) endif endif - cc := CC=clang - real_cc := PATH=$(KERNEL_LLVM_BIN):$$PATH REAL_CC=clang CLANG_TRIPLE=aarch64-linux-gnu- AR=llvm-ar LD=ld.lld NM=llvm-nm LLVM=1 LLVM_IAS=1 + cc_args := PATH=$(KERNEL_LLVM_BIN):$$PATH CC=clang REAL_CC=clang CLANG_TRIPLE=$(CLANG_ARCH) AR=llvm-ar LD=ld.lld NM=llvm-nm LLVM=1 LLVM_IAS=1 else ifeq ($(strip $(KERNEL_GCC_NOANDROID_CHK)),0) KERNEL_CFLAGS := KCFLAGS=-mno-android @@ -155,7 +153,7 @@ GKI_PLATFORM_NAME := $(shell echo $(GKI_PLATFORM_NAME) | sed "s/vendor\///g") TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/arm64/configs/vendor/$(GKI_PLATFORM_NAME)_GKI.config) # Generate the defconfig file from the fragments -cmd := $(PATH_OVERRIDE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) TARGET_BUILD_VARIANT=user $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(KERNEL_DEFCONFIG) +cmd := $(PATH_OVERRIDE) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(cc_args) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) TARGET_BUILD_VARIANT=user $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(KERNEL_DEFCONFIG) _x := $(shell $(cmd)) else TARGET_USES_UNCOMPRESSED_KERNEL := $(shell grep "CONFIG_BUILD_ARM64_UNCOMPRESSED_KERNEL=y" $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG)) @@ -212,7 +210,7 @@ ifeq ($(GKI_KERNEL),1) BOARD_KERNEL-GKI_BOOTIMAGE_PARTITION_SIZE := 0x06000000 # Generate the GKI defconfig - _x := $(shell ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) TARGET_BUILD_VARIANT=user $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(GKI_KERNEL_DEFCONFIG)) + _x := $(shell ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(cc_args) KERN_OUT=$(KERNEL_OUT) $(TARGET_KERNEL_MAKE_ENV) MAKE_PATH=$(MAKE_PATH) TARGET_BUILD_VARIANT=user $(TARGET_KERNEL_SOURCE)/scripts/gki/generate_defconfig.sh $(GKI_KERNEL_DEFCONFIG)) endif endif @@ -290,8 +288,7 @@ define build-kernel DTS_VENDOR=$(TARGET_DTS_VENDOR) \ HAS_MODULES=$(MODULES) \ device/qcom/kernelscripts/buildkernel.sh \ - $(cc) \ - $(real_cc) \ + $(cc_args) \ $(TARGET_KERNEL_MAKE_ENV) endef |