summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-01-08 15:34:30 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-01-02 18:17:02 +0100
commitfb544738afe54575997056bc1f1e95923416ebd0 (patch)
tree90002555c28d7b019579ddcfbe59e1e1975d2368
parent0cb9d3cfed8d10297dd1600bfc6ca2896f613652 (diff)
downloadbuild-fb544738afe54575997056bc1f1e95923416ebd0.zip
build-fb544738afe54575997056bc1f1e95923416ebd0.tar.gz
build-fb544738afe54575997056bc1f1e95923416ebd0.tar.bz2
use the GNU/Linux Distribution's arm toolchain for the kernel
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
-rw-r--r--core/tasks/kernel.mk8
-rw-r--r--envsetup.sh10
2 files changed, 8 insertions, 10 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk
index 368e1a3..dc56927 100644
--- a/core/tasks/kernel.mk
+++ b/core/tasks/kernel.mk
@@ -204,20 +204,20 @@ endif
TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX))
ifneq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)
-KERNEL_TOOLCHAIN_PREFIX ?= $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)
+KERNEL_TOOLCHAIN_PREFIX ?= arm-none-eabi-
else ifeq ($(KERNEL_ARCH),arm64)
KERNEL_TOOLCHAIN_PREFIX ?= aarch64-linux-android-
else ifeq ($(KERNEL_ARCH),arm)
-KERNEL_TOOLCHAIN_PREFIX ?= arm-eabi-
+KERNEL_TOOLCHAIN_PREFIX ?= arm-none-eabi-
else ifeq ($(KERNEL_ARCH),x86)
KERNEL_TOOLCHAIN_PREFIX ?= x86_64-linux-android-
endif
ifeq ($(KERNEL_TOOLCHAIN),)
-KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN_PREFIX)
+KERNEL_TOOLCHAIN_PATH := arm-none-eabi-
else
ifneq ($(KERNEL_TOOLCHAIN_PREFIX),)
-KERNEL_TOOLCHAIN_PATH := $(KERNEL_TOOLCHAIN)/$(KERNEL_TOOLCHAIN_PREFIX)
+KERNEL_TOOLCHAIN_PATH := arm-none-eabi-
endif
endif
diff --git a/envsetup.sh b/envsetup.sh
index 4405cb5..adfad9a 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -196,12 +196,10 @@ function setpaths()
unset ANDROID_KERNEL_TOOLCHAIN_PATH
case $ARCH in
arm)
- # Legacy toolchain configuration used for ARM kernel compilation
- toolchaindir=arm/arm-eabi-$targetlegacygccversion/bin
- if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
- export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"
- ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":
- fi
+ # use the toolchain that comes with the Linux Distribution
+ export ARM_EABI_TOOLCHAIN="arm-none-eabi-"
+ ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":
+
;;
*)
# No need to set ARM_EABI_TOOLCHAIN for other ARCHs