Changeset 2395Tweet

Timestamp:

Feb 11, 2013, 4:27:55 PM (10 years ago)

Author:

sam

Message:

build: better check for compiler flags; we no longer try to use
flags that autoconf hasn’t checked first.

Location:

trunk

Files:

• build/autotools/m4/lol-misc.m4 (added)
• configure.ac (modified) (1 diff)
• src/bullet/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -140 +140 @@
 AM_CONDITIONAL(USE_DOT, test "${DOT}" != "no")
 
-dnl No exceptions
-AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions -fno-rtti"
-dnl Optimizations
+
+dnl  No exceptions
+LOL_TRY_CXXFLAGS(-fno-exceptions, [AM_CXXFLAGS="${AM_CXXFLAGS} -fno-exceptions"])
+LOL_TRY_CXXFLAGS(-fno-rtti, [AM_CXXFLAGS="${AM_CXXFLAGS} -fno-rtti"])
+
+dnl  Optimizations
 AM_CXXFLAGS="${AM_CXXFLAGS} ${REL} ${OPT}"
-dnl Code qui fait des warnings == code de porc == deux baffes dans ta gueule
-AM_CPPFLAGS="${AM_CPPFLAGS} -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Wsign-compare"
+
+dnl  Code qui fait des warnings == code de porc == deux baffes dans ta gueule
+LOL_TRY_CXXFLAGS(-Wall, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wall"])
+LOL_TRY_CXXFLAGS(-Wextra, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wextra"])
+LOL_TRY_CXXFLAGS(-Wpointer-arith, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wpointer-arith"])
+LOL_TRY_CXXFLAGS(-Wcast-align, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wcast-align"])
+LOL_TRY_CXXFLAGS(-Wcast-qual, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wcast-qual"])
+LOL_TRY_CXXFLAGS(-Wshadow, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wshadow"])
+LOL_TRY_CXXFLAGS(-Wsign-compare, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wsign-compare"])
+
+dnl  Add these even though they're implicitly set, so that we can safely
+dnl  remove them from within a Makefile.
+LOL_TRY_CXXFLAGS(-Wno-maybe-uninitialized, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wno-maybe-uninitialized"])
+LOL_TRY_CXXFLAGS(-Wno-narrowing, [AM_CPPFLAGS="${AM_CPPFLAGS} -Wno-narrowing"])
+
 
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")

trunk/src/bullet/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = liblolbullet.a
 
+# Only remove flags that were actually set, because we don't know
+# what the compiler actually accepts.
+disable_cflags = $(filter $(AM_CPPFLAGS:-W%=-Wno-%), \
+    -Wno-shadow -Wno-unused -Wno-cast-qual -Wno-strict-aliasing \
+    -Wno-reorder -Wno-maybe-uninitialized, -Wno-narrowing \
+    -Wno-parentheses)
+
 liblolbullet_a_SOURCES = $(bullet_sources)
-liblolbullet_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) \
-    -Wno-extra -Wno-shadow -Wno-unused -Wno-cast-qual -Wno-strict-aliasing \
-    -Wno-parentheses -Wno-reorder
+liblolbullet_a_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir) $(disable_cflags)
 
 bullet_sources =