p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Switch x86 and x86_64 build to use GCC 4.9" 

This reverts commit 533c7aa6a2.

(cherry picked from commit f123057f5e)

Change-Id: I6dd4ccb100341cf6ebf83829448b0ca7395d5468
This commit is contained in:
Christopher Ferris 2015-03-17 01:29:51 +00:00
parent a9ee744457
commit 1a97c05380
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/combo/TARGET_linux-x86.mk
View File

@ -23,10 +23,10 @@ TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86
endif endif
# Decouple NDK library selection with platform compiler version # Decouple NDK library selection with platform compiler version
$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9 $(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.8
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9 $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8
else else
$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif

2
core/combo/TARGET_linux-x86_64.mk
View File

@ -26,7 +26,7 @@ endif
TARGET_NDK_GCC_VERSION := 4.9 TARGET_NDK_GCC_VERSION := 4.9
ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
TARGET_GCC_VERSION := 4.9 TARGET_GCC_VERSION := 4.8
else else
TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
endif endif