diff options
| author | Thomas Zander <thomas.e.zander@googlemail.com> | 2017-06-22 19:12:25 +0200 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2017-06-23 19:39:18 +1000 |
| commit | 8f4dffe8759ec26f894836be1616e9b31f7fdb01 (patch) | |
| tree | 61c760a9e6202b8f49d4360eeb52be77952d5b7e | |
| parent | 1ab8a51c24d17db373eb76ee2b806836716629e6 (diff) | |
| download | flac-8f4dffe8759ec26f894836be1616e9b31f7fdb01.tar.gz | |
Silence -finline-functions warning
This warning flag is gcc-specfic.
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
| -rw-r--r-- | build/exe.mk | 7 | ||||
| -rw-r--r-- | build/lib.mk | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/build/exe.mk b/build/exe.mk index 93b5e2a3..1ff6d2d1 100644 --- 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) diff --git a/build/lib.mk b/build/lib.mk index 8109af9f..4f818e7c 100644 --- 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) |