Make TARGET_LEGACY_GCC_VERSION work like TARGET_GCC_VERSION.

OMAP4-AOSP · Sep 17, 2016 · 0c71f68 · 0c71f68
1 parent 1dde142
commit 0c71f68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
@@ -38,11 +38,16 @@ $(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
 
+ifeq ($(strip $(TARGET_LEGACY_GCC_VERSION_EXP)),)
+$(combo_2nd_arch_prefix)TARGET_LEGACY_GCC_VERSION := 4.8
+else
+$(combo_2nd_arch_prefix)TARGET_LEGACY_GCC_VERSION := $(TARGET_LEGACY_GCC_VERSION_EXP)
+endif
+
 TARGET_ARCH_SPECIFIC_MAKEFILE := $(BUILD_COMBOS)/arch/$(TARGET_$(combo_2nd_arch_prefix)ARCH)/$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT).mk
 ifeq ($(strip $(wildcard $(TARGET_ARCH_SPECIFIC_MAKEFILE))),)
 $(error Unknown ARM architecture version: $(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))

diff --git a/envsetup.sh b/envsetup.sh
@@ -192,6 +192,7 @@ function setpaths()
     targetgccversion2=$(get_build_var 2ND_TARGET_GCC_VERSION)
     targetlegacygccversion=$(get_build_var TARGET_LEGACY_GCC_VERSION)
     export TARGET_GCC_VERSION=$targetgccversion
+    export TARGET_LEGACY_GCC_VERSION=$targetlegacygccversion
 
     # The gcc toolchain does not exists for windows/cygwin. In this case, do not reference it.
     export ANDROID_TOOLCHAIN=