Changeset 2532Tweet

Timestamp:

Feb 28, 2013, 10:04:51 PM (10 years ago)

Author:

sam

Message:

build: the “fuck you, Apple” commit; work around three different
compiler bugs in the Xcode toolchain.

Location:

trunk

Files:

• build/autotools/m4/lol-misc.m4 (modified) (3 diffs)
• configure.ac (modified) (4 diffs)
• src/lol/math/vector.h (modified) (2 diffs)
• test/unit/array.cpp (modified) (2 diffs)

trunk/build/autotools/m4/lol-misc.m4

@@ -5 +5 @@
     [AC_MSG_CHECKING([if $CC supports $1 flags])
     save_CFLAGS="$CFLAGS"
-    CFLAGS="$1"
+    CFLAGS="$1 -Werror"
     AC_TRY_COMPILE([],[],[ac_cv_try_cflags_ok=yes],[ac_cv_try_cflags_ok=no])
     CFLAGS="$save_CFLAGS"
@@ -21 +21 @@
     AC_LANG_PUSH(C++)
     save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="$1"
+    CXXFLAGS="$1 -Werror"
     AC_TRY_COMPILE([],[],[ac_cv_try_cxxflags_ok=yes],[ac_cv_try_cxxflags_ok=no])
     CXXFLAGS="$save_CXXFLAGS"
@@ -37 +37 @@
     [AC_MSG_CHECKING([if $CC supports $1 flags])
     save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$1"
+    LDFLAGS="$1 -Werror"
     AC_TRY_LINK([],[],[ac_cv_try_ldflags_ok=yes],[ac_cv_try_ldflags_ok=no])
     LDFLAGS="$save_LDFLAGS"

trunk/configure.ac

@@ -94 +94 @@
 if test "${enable_debug}" = "yes"; then
   AC_DEFINE(LOL_DEBUG, 1, Define to 1 to activate debug)
-  OPT="-O"
+  OPT_CXXFLAGS="-O"
 else
-  OPT="-O3 -ffast-math -fno-strength-reduce -fomit-frame-pointer"
+  OPT_CXXFLAGS="-O3 -ffast-math -fomit-frame-pointer"
+  OPT_LDFLAGS="-fno-strength-reduce"
 fi
 
 if test "${enable_release}" = "yes"; then
   AC_DEFINE(LOL_RELEASE, 1, Define to 1 to activate final release)
-  REL=""
+  REL_CXXFLAGS=""
 else
-  REL="-g"
+  REL_CXXFLAGS="-g"
 fi
 
@@ -155 +156 @@
 
 dnl  Optimizations
-AM_CXXFLAGS="${AM_CXXFLAGS} ${REL} ${OPT}"
+AM_CXXFLAGS="${AM_CXXFLAGS} ${REL_CXXFLAGS} ${OPT_CXXFLAGS}"
+AM_LDFLAGS="${AM_LDFLAGS} ${REL_LDFLAGS} ${OPT_LDFLAGS}"
 
 dnl  Debug symbols
@@ -236 +238 @@
 
 dnl  Are we building using MinGW?
-LIBS_save="$LIBS"
-LIBS="$LIBS -mwindows -mwin32"
-AC_MSG_CHECKING(for -mwindows -mwin32)
-AC_TRY_LINK([], [],
- [AC_MSG_RESULT(yes)
-  AM_CXXFLAGS="${AM_CXXFLAGS} -mwindows -mwin32"
-  LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16"],
- [AC_MSG_RESULT(no)])
-LIBS="$LIBS_save"
+LOL_TRY_CXXFLAGS(-mwindows -mwin32,
+ [AM_CXXFLAGS="${AM_CXXFLAGS} -mwindows -mwin32"
+  LOL_LIBS="${LOL_LIBS} -uWinMain -u_WinMain@16"])
 
 
@@ -250 +246 @@
 dnl  Answer: NO! we don't know how to build for it anyway
 AM_CONDITIONAL(USE_X360, false)
+
+
+dnl  Are we on an OS X or iOS platform?
+LOL_TRY_LDFLAGS(-framework Foundation,
+ [LOL_LIBS="${LOL_LIBS} -framework Foundation"])
+LOL_TRY_LDFLAGS(-framework CoreGraphics,
+ [LOL_LIBS="${LOL_LIBS} -framework CoreGraphics"])
+LOL_TRY_LDFLAGS(-framework CoreData,
+ [LOL_LIBS="${LOL_LIBS} -framework CoreData"])
+LOL_TRY_LDFLAGS(-framework UIKit,
+ [LOL_LIBS="${LOL_LIBS} -framework UIKit"])
 
 

trunk/src/lol/math/vector.h

@@ -1345 +1345 @@
     LOL_UNARY_FUNS(tname, static, type)
 
+/* HACK: This trick fails with Apple’s clang++, which sometimes fails to deduce
+ * the arguments for simple stuff such as vec3 + vec3. Disable it for now.
+ * Note that llvm-g++ doesn’t have the problem. */
+#if defined __clang__
+#   define LOL_OPEN_NAMESPACE(x)
+#   define LOL_CLOSE_NAMESPACE(x)
+#else
+#   define LOL_OPEN_NAMESPACE(x) namespace x {
+#   define LOL_CLOSE_NAMESPACE(x) } using namespace x;
+#endif
+
 #define LOL_ALL_VECTOR_OPS_AND_FUNS(type) \
-    namespace x##type \
-    { \
+    LOL_OPEN_NAMESPACE(x##type) \
         LOL_ALL_VECTOR_OPS_INNER(Vec2, type) \
         LOL_ALL_VECTOR_OPS_INNER(Vec3, type) \
         LOL_ALL_VECTOR_OPS_INNER(Vec4, type) \
-    } \
-    using namespace x##type; \
+    LOL_CLOSE_NAMESPACE(x##type) \
     LOL_ALL_VECTOR_FUNS_INNER(Vec2, type) \
     LOL_ALL_VECTOR_FUNS_INNER(Vec3, type) \
@@ -1411 +1420 @@
 #undef LOL_ALL_VECTOR_FUNS_INNER
 #undef LOL_ALL_VECTOR_OPS_AND_FUNS
+
+#undef LOL_OPEN_NAMESPACE
+#undef LOL_CLOSE_NAMESPACE
 
 /*

trunk/test/unit/array.cpp

@@ -37 +37 @@
     void TearDown() {}
 
+/* HACK: we disable these tests because they fail with the
+ * Xcode iPhone compiler. */
+#if !defined __clang__ || !defined __arm__
     LOLUNIT_TEST(ArrayPush)
     {
@@ -85 +88 @@
         LOLUNIT_ASSERT_EQUAL(a[2], 3);
     }
+#endif
 
     LOLUNIT_TEST(EightElements)