diff options
author | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-07 18:36:56 +0000 |
---|---|---|
committer | Andree Buschmann <AndreeBuschmann@t-online.de> | 2011-09-07 18:36:56 +0000 |
commit | 28c4f2a84e8b87392dcfff8200fbbc10d5c24adf (patch) | |
tree | 3ebfeadf86b31b0ef723623ea7cda482b2797530 | |
parent | c1a14863f565a79106f4e7efbcaf26bbd5543b69 (diff) | |
download | rockbox-28c4f2a84e8b87392dcfff8200fbbc10d5c24adf.tar.gz rockbox-28c4f2a84e8b87392dcfff8200fbbc10d5c24adf.zip |
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
-rw-r--r-- | apps/plugins/doom/doom.make | 4 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.make | 4 |
2 files changed, 4 insertions, 4 deletions
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) | |||
20 | 20 | ||
21 | DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing | 21 | DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing |
22 | 22 | ||
23 | # Set '-fgnu89-inline' if supported for the target. | 23 | # Set '-fgnu89-inline' if supported (GCCVER >= 4.1.3, GCCNUM >= 401) |
24 | ifneq ($(CPU),mips) | 24 | ifeq ($(shell expr $(GCCNUM) \>= 401),1) |
25 | DOOMCFLAGS += -fgnu89-inline | 25 | DOOMCFLAGS += -fgnu89-inline |
26 | endif | 26 | endif |
27 | 27 | ||
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)) | |||
18 | # add source files to OTHER_SRC to get automatic dependencies | 18 | # add source files to OTHER_SRC to get automatic dependencies |
19 | OTHER_SRC += $(MPEG_SRC) | 19 | OTHER_SRC += $(MPEG_SRC) |
20 | 20 | ||
21 | # Set '-fgnu89-inline' if supported for the target. | 21 | # Set '-fgnu89-inline' if supported (GCCVER >= 4.1.3, GCCNUM >= 401) |
22 | ifneq ($(CPU),mips) | 22 | ifeq ($(shell expr $(GCCNUM) \>= 401),1) |
23 | MPEGCFLAGS = $(PLUGINFLAGS) -fgnu89-inline | 23 | MPEGCFLAGS = $(PLUGINFLAGS) -fgnu89-inline |
24 | else | 24 | else |
25 | MPEGCFLAGS = $(PLUGINFLAGS) | 25 | MPEGCFLAGS = $(PLUGINFLAGS) |