Changeset 1511Tweet

Timestamp:

Jun 22, 2012, 7:13:01 PM (11 years ago)

Author:

sam

Message:

build: ensure that the Linux build machines are what they advertise, or
fail the build (if eg. we try to build an amd64 binary on i386).

File:

• trunk/build/lol-build (modified) (2 diffs)

trunk/build/lol-build

@@ -114 +114 @@
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
+            ;;
+        *-i386)
+            # Ensure we're _really_ on i386
+            CXXFLAGS="$CXXFLAGS -m32"
+            ;;
+        *-amd64)
+            # Ensure we're _really_ on amd64
+            CXXFLAGS="$CXXFLAGS -m64"
             ;;
     esac
@@ -158 +166 @@
             ;;
         *)
-            PATH="$PATH" ./configure
+            PATH="$PATH" ./configure CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS"
             ;;
     esac