diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-17 01:31:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-17 01:31:16 +0000 |
| commit | 13169ccba2d9e11e311babd8fc80f41c610c753e (patch) | |
| tree | 136bc7600924b43f4f5afac7e8fff5387c1707e0 | |
| parent | 0f98a3781c4fab57bdd696cca3edd6614d65abe6 (diff) | |
| parent | f123057f5e080687ce17e0e9c23a62954db53f39 (diff) | |
| download | build-13169ccba2d9e11e311babd8fc80f41c610c753e.zip build-13169ccba2d9e11e311babd8fc80f41c610c753e.tar.gz build-13169ccba2d9e11e311babd8fc80f41c610c753e.tar.bz2 | |
Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86_64.mk | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 1f8fb88..2adb157 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -26,7 +26,7 @@ endif TARGET_NDK_GCC_VERSION := 4.9 ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),) -TARGET_GCC_VERSION := 4.9 +TARGET_GCC_VERSION := 4.8 else TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP) endif |