diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-08 15:34:30 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-01-08 15:34:30 +0100 |
| commit | e0bdfe3931ab394eaa9c22b0c5811313f148b5e2 (patch) | |
| tree | 8b731379e99d07efeb7922368d73075ef92b855d | |
| parent | 599873b301727b3281eac873d9c679d01015b35f (diff) | |
| download | build-e0bdfe3931ab394eaa9c22b0c5811313f148b5e2.zip build-e0bdfe3931ab394eaa9c22b0c5811313f148b5e2.tar.gz build-e0bdfe3931ab394eaa9c22b0c5811313f148b5e2.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.mk | 8 | ||||
| -rw-r--r-- | envsetup.sh | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/core/tasks/kernel.mk b/core/tasks/kernel.mk index d1d24d6..4a4067a 100644 --- a/core/tasks/kernel.mk +++ b/core/tasks/kernel.mk @@ -166,17 +166,17 @@ KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX)) ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),) ifeq ($(KERNEL_TOOLCHAIN_PREFIX),) -KERNEL_TOOLCHAIN_PREFIX := arm-eabi- +KERNEL_TOOLCHAIN_PREFIX := arm-none-eabi- endif else -KERNEL_TOOLCHAIN_PREFIX := $(TARGET_KERNEL_CROSS_COMPILE_PREFIX) +KERNEL_TOOLCHAIN_PREFIX := arm-none-eabi- 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 f0ae691..8e9b5a6 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -190,12 +190,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 |