Silence -finline-functions warning

This warning flag is gcc-specfic. Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>

Silence -finline-functions warning
This warning flag is gcc-specfic. Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
8f4dffe8 · Thomas Zander · Erik de Castro Lopo · 1ab8a51c · 8f4dffe8 · 8f4dffe8
Commit 8f4dffe8 authored Jun 22, 2017 by Thomas Zander Committed by Erik de Castro Lopo Jun 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

build/exe.mk build/exe.mk +5 -2

build/lib.mk build/lib.mk +5 -2

No files found.
--- a/build/exe.mk
+++ b/build/exe.mk
@@ -34,6 +34,9 @@ else
    CCC         = g++
 endif
 endif
+ifeq ($(CC),gcc)
+    GCC_INLINE  = -finline-functions
+endif
 NASM        = nasm
 LINK        = $(CC) $(LINKAGE)
 OBJPATH     = $(topdir)/objs
@@ -60,8 +63,8 @@ CXXFLAGS := -g -O0 -DDEBUG -DDEBUG -DFLAC__VALGRIND_TESTING $(CXXFLAGS) $(BASE_C
 endif

 ifeq ($(DEFAULT_BUILD),release)
-CFLAGS   := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
-CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CXXFLAGS) $(BASE_CFLAGS)
+CFLAGS   := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
+CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CXXFLAGS) $(BASE_CFLAGS)
 endif

 LFLAGS   = -L$(LIBPATH)

--- a/build/lib.mk
+++ b/build/lib.mk
@@ -34,6 +34,9 @@ else
    CCC         = g++
 endif
 endif
+ifeq ($(CC),gcc)
+    GCC_INLINE  = -finline-functions
+endif
 NASM        = nasm
 LINK        = ar cru
 OBJPATH     = $(topdir)/objs
@@ -79,8 +82,8 @@ CXXFLAGS := -g -O0 -DDEBUG -DDEBUG -DFLAC__VALGRIND_TESTING $(CFLAGS) $(BASE_CFL
 endif

 ifeq ($(DEFAULT_BUILD),release)
-CFLAGS   := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
-CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS)
+CFLAGS   := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
+CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS)
 endif

 LFLAGS   = -L$(LIBPATH)