Merge "Revert "Revert "kernel: fix KERNEL_TOOLCHAIN_PATH_gcc and usage""" into android-12.1

This commit is contained in:
Nebrassy
2022-07-30 14:24:19 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -214,7 +214,7 @@ ifneq ($(TARGET_KERNEL_MODULES),)
$(error TARGET_KERNEL_MODULES is no longer supported!)
endif
PATH_OVERRIDE += PATH=$(KERNEL_TOOLCHAIN_PATH_gcc)/bin:$$PATH
PATH_OVERRIDE += PATH=$(KERNEL_TOOLCHAIN_PATH_gcc):$$PATH
# System tools are no longer allowed on 10+
PATH_OVERRIDE += $(TOOLS_PATH_OVERRIDE)
+1 -1
View File
@@ -87,7 +87,7 @@ endif
# We need to add GCC toolchain to the path no matter what
# for tools like `as`
KERNEL_TOOLCHAIN_PATH_gcc := $(KERNEL_TOOLCHAIN_$(KERNEL_ARCH))/$(KERNEL_TOOLCHAIN_PREFIX_$(KERNEL_ARCH))
KERNEL_TOOLCHAIN_PATH_gcc := $(KERNEL_TOOLCHAIN_$(KERNEL_ARCH))
ifneq ($(USE_CCACHE),)
ifneq ($(CCACHE_EXEC),)