Changeset 2954 for box/trunk/configure.ac

Timestamp:

02/05/2011 12:25:49 (13 months ago)

Author:

jamesog

Message:

Finally unbreak build on Solaris!

• Add code to configure to detect whether we should compile with -m32 or -m64. GCC on Solaris defaults to 32-bit even of the OS is running in 64-bit mode. (Solaris only)
• Change the CFLAGS, CXXFLAGS and LDFLAGS definitions to be append rather than set. This allows passing them at compile-time to make(1).

File:

• box/trunk/configure.ac (modified) (2 diffs)

box/trunk/configure.ac

@@ -22 +22 @@
   AC_MSG_ERROR([[basic compile checks failed, the C++ compiler is broken]])
 fi
+
+case $build_os in
+solaris*)
+  isa_bits=`isainfo -b`
+  AC_MSG_NOTICE([setting compiler to use -m$isa_bits on Solaris])
+  CFLAGS="$CFLAGS -m$isa_bits"
+  CXXFLAGS="$CXXFLAGS -m$isa_bits"
+  LDFLAGS="$LDFLAGS -m$isa_bits"
+  ;;
+esac
 
 if test "x$GXX" = "xyes"; then
@@ -412 +422 @@
         if test "$cmd" = "subdir"; then
                 echo
-                export CC CXX CXXFLAGS LDFLAGS LIBS
+                export CC CXX CFLAGS CXXFLAGS LDFLAGS LIBS
                 args="$configure_args --target=$target_alias"
                 echo "Configuring $subdir with: $args"