StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix paths when 2nd arch gcc is a different version

Browse Source 
arm64 is using gcc 4.9, arm is using gcc 4.8.  Fix setpaths() to
get a separate version for the 2nd arch.

Change-Id: I7bde01308fc7718360e7d0fbd46b3ae8c5f55fa7
This commit is contained in:
Colin Cross
2014-05-22 11:57:43 -07:00
parent 0dbcff9599
commit 03b424a50b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
envsetup.sh
View File

@@ -120,6 +120,7 @@ function setpaths()
# defined in core/config.mk # defined in core/config.mk
targetgccversion=$(get_build_var TARGET_GCC_VERSION) targetgccversion=$(get_build_var TARGET_GCC_VERSION)
targetgccversion2=$(get_build_var 2ND_TARGET_GCC_VERSION)
export TARGET_GCC_VERSION=$targetgccversion export TARGET_GCC_VERSION=$targetgccversion
# The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it. # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
@@ -134,7 +135,7 @@ function setpaths()
arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin arm) toolchaindir=arm/arm-linux-androideabi-$targetgccversion/bin
;; ;;
arm64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin; arm64) toolchaindir=aarch64/aarch64-linux-android-$targetgccversion/bin;
toolchaindir2=arm/arm-linux-androideabi-$targetgccversion/bin toolchaindir2=arm/arm-linux-androideabi-$targetgccversion2/bin
;; ;;
mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin mips) toolchaindir=mips/mipsel-linux-android-$targetgccversion/bin
;; ;;