From c84395eada8c25e1b91e0a2928ef83346f322b9e Mon Sep 17 00:00:00 2001 From: Alessandro Astone Date: Sat, 11 Dec 2021 01:49:53 +0100 Subject: [PATCH] Revert "Revert "kernel: fix KERNEL_TOOLCHAIN_PATH_gcc and usage"" The fix was correct... This reverts commit 168fd231b65f3bd575529984f552354f4c5e3e8b. Change-Id: If550fd44f32b801553b8ac23cb2a91d3f29df557 --- build/tasks/kernel.mk | 2 +- config/BoardConfigKernel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk index 3d5baab..8a19765 100644 --- a/build/tasks/kernel.mk +++ b/build/tasks/kernel.mk @@ -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) diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk index c136581..2533f94 100644 --- a/config/BoardConfigKernel.mk +++ b/config/BoardConfigKernel.mk @@ -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),)