Ticket #2304: cludgy_build_changes.patch

build/premake/premake4.lua

@@ -28 +28 @@
 newoption { trigger = "datadir", description = "Directory for data files (typically '/usr/share/games/0ad'); default is ../data/ relative to executable" }
 newoption { trigger = "libdir", description = "Directory for libraries (typically '/usr/lib/games/0ad'); default is ./ relative to executable" }
 
+--  ugly hack to use clang
+premake.gcc.cc  = 'clang'
+premake.gcc.cxx = 'clang++'
+
 -- Root directory of project checkout relative to this .lua file
 rootdir = "../.."
 
@@ -341 +345 @@
             buildoptions {
                 -- Hide symbols in dynamic shared objects by default, for efficiency and for equivalence with
                 -- Windows - they should be exported explicitly with __attribute__ ((visibility ("default")))
-                "-fvisibility=hidden"
+                "-fvisibility=hidden",
+                "-stdlib=libstdc++"
             }
+            linkoptions {
+                "-stdlib=libstdc++"
+            }
         end
 
         if _OPTIONS["bindir"] then

libraries/osx/build-osx-libs.sh

@@ -60 +60 @@
 # Define compiler as "gcc" (in case anything expects e.g. gcc-4.2)
 # On newer OS X versions, this will be a symbolic link to LLVM GCC
 # TODO: don't rely on that
-export CC=${CC:="gcc"} CXX=${CXX:="g++"}
+#export CC=${CC:="gcc"} CXX=${CXX:="g++"}
+export CC=${CC:="clang"} CXX=${CXX:="clang++"}
 
 # The various libs offer inconsistent configure options, some allow
 # setting sysroot and OS X-specific options, others don't. Adding to
@@ -84 +85 @@
 CFLAGS="$CFLAGS -arch $ARCH"
 # Avoid linker warnings about compiling translation units with different visibility settings
 CPPFLAGS="$CPPFLAGS $CFLAGS -fvisibility=hidden"
+CPPFLAGS="$CPPFLAGS -stdlib=libstdc++" #-lstdc++.6"
 LDFLAGS="$LDFLAGS -arch $ARCH"
+LDFLAGS="$LDFLAGS -stdlib=libstdc++" # -lstdc++.6"
 
 JOBS=${JOBS:="-j2"}