diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-17 01:29:51 +0000 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2015-03-17 01:29:51 +0000 |
| commit | f123057f5e080687ce17e0e9c23a62954db53f39 (patch) | |
| tree | e3cb1fda8341187ac6d636f3408fe171ad41abd4 /core/combo/TARGET_linux-x86.mk | |
| parent | 533c7aa6a293659541222f0dd89bee044ba71a2a (diff) | |
| download | build-f123057f5e080687ce17e0e9c23a62954db53f39.zip build-f123057f5e080687ce17e0e9c23a62954db53f39.tar.gz build-f123057f5e080687ce17e0e9c23a62954db53f39.tar.bz2 | |
Revert "Switch x86 and x86_64 build to use GCC 4.9"
This reverts commit 533c7aa6a293659541222f0dd89bee044ba71a2a.
Change-Id: I5203db8454d9af8fb438af6308106945e5dc0dbf
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index d445ed7..f17a514 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -23,10 +23,10 @@ TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := x86 endif # 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)),) -$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9 +$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8 else $(combo_2nd_arch_prefix)TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif |