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

Commit e9b15e2c authored Mar 25, 2015 by Ying Wang Committed by Gerrit Code Review Mar 25, 2015

Merge "Switch x86 and x86_64 to 4.9. Attempt #2."

parents 5d60719e 6fb735b0

core/combo/TARGET_linux-x86.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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.8		$(combo_2nd_arch_prefix)TARGET_NDK_GCC_VERSION := 4.9

	ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)		ifeq ($(strip $(TARGET_GCC_VERSION_EXP)),)
	$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.8		$(combo_2nd_arch_prefix)TARGET_GCC_VERSION := 4.9
	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

core/combo/TARGET_linux-x86_64.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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.8		TARGET_GCC_VERSION := 4.9
	else		else
	TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)		TARGET_GCC_VERSION := $(TARGET_GCC_VERSION_EXP)
	endif		endif