diff options
| author | Brandon McAnsh <brandon.mcansh@gmail.com> | 2015-10-10 10:20:38 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-10-10 17:08:35 -0700 |
| commit | faf353565ad261870866fbdde3cf5f20cafafa73 (patch) | |
| tree | 6b3673d1370b2e7568255109e8a58b2fff8b6a2b /envsetup.sh | |
| parent | 8d442bdde929c68480a53cb06d91ad431b829b0a (diff) | |
| download | build-faf353565ad261870866fbdde3cf5f20cafafa73.zip build-faf353565ad261870866fbdde3cf5f20cafafa73.tar.gz build-faf353565ad261870866fbdde3cf5f20cafafa73.tar.bz2 | |
Set kernel gcc version to 4.8 for ARM targets
* This causes the check during path setup for an arm-eabi-4.9 toolchain to fail,
thus only leaving the arm-linux-androideabi- to exist.
* This is only temporary as Google is building with 4.9 and 4.8 gcc's
have been removed in their next release
Was updated to 4.9 here: https://github.com/CyanogenMod/android_build/commit/bf8346e90c5a6d5d809fa7166d50714b2b6bc30d
Toolchain check here: https://github.com/CyanogenMod/android_build/blob/cm-13.0/envsetup.sh#L189
Change-Id: I24bff10e392a6cdced1797870e523144e83d611d
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Diffstat (limited to 'envsetup.sh')
| -rw-r--r-- | envsetup.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh index 3605a59..82b58e6 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -151,6 +151,7 @@ function setpaths() # defined in core/config.mk targetgccversion=$(get_build_var TARGET_GCC_VERSION) targetgccversion2=$(get_build_var 2ND_TARGET_GCC_VERSION) + targetlegacygccversion=$(get_build_var TARGET_LEGACY_GCC_VERSION) export TARGET_GCC_VERSION=$targetgccversion # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it. @@ -186,7 +187,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-$targetlegacygccversion/bin if [ -d "$gccprebuiltdir/$toolchaindir" ]; then export ARM_EABI_TOOLCHAIN="$gccprebuiltdir/$toolchaindir" ANDROID_KERNEL_TOOLCHAIN_PATH="$ARM_EABI_TOOLCHAIN": |