Revert "Revert "kernel: fix KERNEL_TOOLCHAIN_PATH_gcc and usage""
The fix was correct...
This reverts commit 168fd231b65f3bd575529984f552354f4c5e3e8b.
Change-Id: If550fd44f32b801553b8ac23cb2a91d3f29df557
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index fc00d37..6d68cf1 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -225,7 +225,7 @@
$(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
ifeq (true,$(filter true, $(TARGET_NEEDS_DTBOIMAGE) $(BOARD_KERNEL_SEPARATED_DTBO)))
KERNEL_MAKE_FLAGS += DTC_EXT=$(KERNEL_BUILD_OUT_PREFIX)$(DTC)
diff --git a/config/BoardConfigKernel.mk b/config/BoardConfigKernel.mk
index c58d274..ef03b01 100644
--- a/config/BoardConfigKernel.mk
+++ b/config/BoardConfigKernel.mk
@@ -83,7 +83,7 @@
# 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),)