kernel: Changes for 5.10 build without GCC
Change-Id: Id6e09467937e60e6b00a30a246ba0a4a8d71687b
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index ceafb62..30683e2 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -234,12 +234,14 @@
KERNEL_CLANG_VERSION := $(LLVM_PREBUILTS_VERSION)
endif
TARGET_KERNEL_CLANG_PATH ?= $(BUILD_TOP)/prebuilts/clang/host/$(HOST_PREBUILT_TAG)/$(KERNEL_CLANG_VERSION)
- ifeq ($(KERNEL_ARCH),arm64)
- KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=aarch64-linux-gnu-
- else ifeq ($(KERNEL_ARCH),arm)
- KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=arm-linux-gnu-
- else ifeq ($(KERNEL_ARCH),x86)
- KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=x86_64-linux-gnu-
+ ifeq (,$(filter 5.10, $(TARGET_KERNEL_VERSION)))
+ ifeq ($(KERNEL_ARCH),arm64)
+ KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=aarch64-linux-gnu-
+ else ifeq ($(KERNEL_ARCH),arm)
+ KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=arm-linux-gnu-
+ else ifeq ($(KERNEL_ARCH),x86)
+ KERNEL_CLANG_TRIPLE ?= CLANG_TRIPLE=x86_64-linux-gnu-
+ endif
endif
PATH_OVERRIDE += PATH=$(TARGET_KERNEL_CLANG_PATH)/bin:$$PATH LD_LIBRARY_PATH=$(TARGET_KERNEL_CLANG_PATH)/lib64:$$LD_LIBRARY_PATH
ifeq ($(KERNEL_CC),)
@@ -251,7 +253,10 @@
$(error TARGET_KERNEL_MODULES is no longer supported!)
endif
-PATH_OVERRIDE += PATH=$(KERNEL_TOOLCHAIN_PATH_gcc):$$PATH
+# 5.10+ can fully compile without gcc
+ifeq (,$(filter 5.10, $(TARGET_KERNEL_VERSION)))
+ PATH_OVERRIDE += PATH=$(KERNEL_TOOLCHAIN_PATH_gcc):$$PATH
+endif
# System tools are no longer allowed on 10+
PATH_OVERRIDE += $(TOOLS_PATH_OVERRIDE)