From 28c4f2a84e8b87392dcfff8200fbbc10d5c24adf Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Wed, 7 Sep 2011 18:36:56 +0000 Subject: Fix FS#12261. Only set '-fgnu89-inline' if GCC >= 4.1.3 is used. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30467 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/doom/doom.make | 4 ++-- apps/plugins/mpegplayer/mpegplayer.make | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make index c71ede6f8c..b9bc1ec06b 100644 --- a/apps/plugins/doom/doom.make +++ b/apps/plugins/doom/doom.make @@ -20,8 +20,8 @@ OTHER_SRC += $(DOOM_SRC) DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing -# Set '-fgnu89-inline' if supported for the target. -ifneq ($(CPU),mips) +# Set '-fgnu89-inline' if supported (GCCVER >= 4.1.3, GCCNUM >= 401) +ifeq ($(shell expr $(GCCNUM) \>= 401),1) DOOMCFLAGS += -fgnu89-inline endif diff --git a/apps/plugins/mpegplayer/mpegplayer.make b/apps/plugins/mpegplayer/mpegplayer.make index 00a11f3ad4..1f74d6597a 100644 --- a/apps/plugins/mpegplayer/mpegplayer.make +++ b/apps/plugins/mpegplayer/mpegplayer.make @@ -18,8 +18,8 @@ MPEG_OBJ := $(call c2obj, $(MPEG_SRC)) # add source files to OTHER_SRC to get automatic dependencies OTHER_SRC += $(MPEG_SRC) -# Set '-fgnu89-inline' if supported for the target. -ifneq ($(CPU),mips) +# Set '-fgnu89-inline' if supported (GCCVER >= 4.1.3, GCCNUM >= 401) +ifeq ($(shell expr $(GCCNUM) \>= 401),1) MPEGCFLAGS = $(PLUGINFLAGS) -fgnu89-inline else MPEGCFLAGS = $(PLUGINFLAGS) -- cgit v1.2.3