[flac-dev] [PATCH 1/2] Revert "configure.ac : If gcc is version 4.2, use -fgnu89-inline."

Rafaël Carré funman at videolan.org
Wed Nov 20 03:16:39 PST 2013


This reverts commit 2860f1780ca92c779ee0a2c545ae1b9c4818dc53.

Conflicts:
	configure.ac

Do not use -fgnu89-inline as it can emit duplicate symbols for
inline functions that are declared in multiple object files
being linked together.

For example on clang 5.0 targetting iOS
(clang advertises itself as gcc 4.2, the last GPL version of gcc)
---
 configure.ac | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f63a04..fa6f4fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,7 +396,7 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
 	if test x$enable_gcc_werror = "xyes" ; then
 		CFLAGS="$CFLAGS -Werror "
 		CXXFLAGS="$CXXFLAGS -Werror "
-		fi
+	fi
 
 	XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
 	XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
@@ -409,18 +409,14 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
 		CPPFLAGS="$CPPFLAGS -DFLAC__USE_VISIBILITY_ATTR"
 		CFLAGS="$CFLAGS -fvisibility=hidden"
 		CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-		fi
-
-	if test "x$GCC_MAJOR_VERSION$GCC_MINOR_VERSION" = "x42" ; then
-		XIPH_ADD_CFLAGS([-fgnu89-inline])
-		fi
+	fi
 
 	if test "x$asm_optimisation" = "xyes" ; then
 		XIPH_ADD_CFLAGS([-msse2])
-		fi
-
 	fi
 
+fi
+
 XIPH_ADD_CFLAGS([-Wextra])
 
 if test x$enable_stack_smash_protection = "xyes" ; then
-- 
1.8.3.4 (Apple Git-47)


More information about the flac-dev mailing list