Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03b424a5 authored by Colin Cross's avatar Colin Cross
Browse files

fix paths when 2nd arch gcc is a different version 

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
parent 0dbcff95

envsetup.sh

+2 −1
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ function setpaths() 


    # defined in core/config.mk

    targetgccversion=$(get_build_var TARGET_GCC_VERSION)

    targetgccversion2=$(get_build_var 2ND_TARGET_GCC_VERSION)

    export TARGET_GCC_VERSION=$targetgccversion



    # 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

            ;;

        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

            ;;