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

Commit 26c78057 authored by Andrew Hsieh's avatar Andrew Hsieh
Browse files

Add pattern to check for GCC 4.6 

GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.

Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
parent 713bac96

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ TARGET_GLOBAL_CFLAGS += \ 
# We cannot turn it off blindly since the option is not available

# in gcc-4.4.x.  We also want to disable sincos optimization globally

# by turning off the builtin sin function.

ifneq ($(filter 4.6.%, $(shell $(TARGET_CC) --version)),)

ifneq ($(filter 4.6 4.6.%, $(shell $(TARGET_CC) --version)),)

TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable -fno-builtin-sin \

			-fno-strict-volatile-bitfields

endif

core/combo/TARGET_linux-mips.mk

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ TARGET_GLOBAL_CFLAGS += \ 
# This warning causes dalvik not to build with gcc 4.6.x and -Werror.

# We cannot turn it off blindly since the option is not available

# in gcc-4.4.x.

ifneq ($(filter 4.6.%, $(shell $(TARGET_CC) --version)),)

ifneq ($(filter 4.6 4.6.%, $(shell $(TARGET_CC) --version)),)

TARGET_GLOBAL_CFLAGS += -Wno-unused-but-set-variable \

                        -fno-strict-volatile-bitfields

endif