Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0881796 authored Mar 17, 2015 by Christopher Ferris Committed by Android Git Automerger Mar 17, 2015

am 8081a8b5: am 13169ccb: Merge "Revert "Switch x86 and x86_64 build to use GCC 4.9""

* commit '8081a8b5':
  Revert "Switch x86 and x86_64 build to use GCC 4.9"

parents bf8164f9 8081a8b5

core/combo/TARGET_linux-x86.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

core/combo/TARGET_linux-x86_64.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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