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

Commit 4dc6ed96 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 9eb87b8d: Merge "Add pattern to check for GCC 4.6" 

* commit '9eb87b8d':
  Add pattern to check for GCC 4.6
parents fe95bc0f 9eb87b8d

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