mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
From 216cc9fe474a16a0105e51d97f7bc49c2e52a0da Mon Sep 17 00:00:00 2001
|
|
From: Tad <tad@spotco.us>
|
|
Date: Wed, 4 Nov 2015 23:11:47 -0500
|
|
Subject: [PATCH] Change toolchain
|
|
|
|
Change-Id: I135e9cdfaec3a70684ee3b3789fe0588d1237712
|
|
---
|
|
core/combo/TARGET_linux-arm.mk | 4 ++--
|
|
envsetup.sh | 6 +++---
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
|
|
index 95b1804..177948b 100644
|
|
--- a/core/combo/TARGET_linux-arm.mk
|
|
+++ b/core/combo/TARGET_linux-arm.mk
|
|
@@ -35,10 +35,10 @@ TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv5te
|
|
endif
|
|
|
|
# Decouple NDK library selection with platform compiler version
|
|
-$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8
|
|
+$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9
|
|
|
|
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
|
|
-$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8
|
|
+$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9-cortex-a15
|
|
else
|
|
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
|
|
endif
|
|
diff --git a/envsetup.sh b/envsetup.sh
|
|
index 51f3253..b5009ed 100644
|
|
--- a/envsetup.sh
|
|
+++ b/envsetup.sh
|
|
@@ -142,7 +142,7 @@ function setpaths()
|
|
gccprebuiltdir=$(get_abs_build_var ANDROID_GCC_PREBUILTS)
|
|
|
|
# defined in core/config.mk
|
|
- targetgccversion=$(get_build_var TARGET_GCC_VERSION)
|
|
+ targetgccversion=4.9-cortex-a15
|
|
targetgccversion2=$(get_build_var 2ND_TARGET_GCC_VERSION)
|
|
export TARGET_GCC_VERSION=$targetgccversion
|
|
|
|
@@ -155,7 +155,7 @@ function setpaths()
|
|
;;
|
|
x86_64) toolchaindir=x86/x86_64-linux-android-$targetgccversion/bin
|
|
;;
|
|
- arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin
|
|
+ arm) toolchaindir=arm/arm-linux-androideabi-4.9-cortex-a15/bin
|
|
;;
|
|
arm64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin;
|
|
toolchaindir2=arm/arm-linux-androideabi-$targetgccversion2/bin
|
|
@@ -179,7 +179,7 @@ function setpaths()
|
|
case $ARCH in
|
|
arm)
|
|
# Legacy toolchain configuration used for ARM kernel compilation
|
|
- toolchaindir=arm/arm-eabi-$targetgccversion/bin
|
|
+ toolchaindir=arm/arm-eabi-4.8-cortex-a15/bin
|
|
if [ -d "$gccprebuiltdir/$toolchaindir" ]; then
|
|
export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir"
|
|
ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN":
|
|
--
|
|
2.6.2
|
|
|