summaryrefslogtreecommitdiffstats
path: root/core/combo
diff options
context:
space:
mode:
authorBrandon McAnsh <brandon.mcansh@gmail.com>2015-10-10 10:20:38 -0400
committerGerrit Code Review <gerrit@cyanogenmod.org>2015-10-10 17:08:35 -0700
commitfaf353565ad261870866fbdde3cf5f20cafafa73 (patch)
tree6b3673d1370b2e7568255109e8a58b2fff8b6a2b /core/combo
parent8d442bdde929c68480a53cb06d91ad431b829b0a (diff)
downloadbuild-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 'core/combo')
-rw-r--r--core/combo/TARGET_linux-arm.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 3651c39..5020865 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -39,6 +39,7 @@ $(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9
+$(combo_2nd_arch_prefix)TARGET_LEGACY_GCC_VERSION := 4.8
else
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif