Changeset 1511 for trunk/build


Ignore:
Timestamp:
Jun 22, 2012, 7:13:01 PM (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r1486 r1511  
    114114            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
    115115            LDFLAGS="$LDFLAGS -L$PWD/contrib/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
     116            ;;
     117        *-i386)
     118            # Ensure we're _really_ on i386
     119            CXXFLAGS="$CXXFLAGS -m32"
     120            ;;
     121        *-amd64)
     122            # Ensure we're _really_ on amd64
     123            CXXFLAGS="$CXXFLAGS -m64"
    116124            ;;
    117125    esac
     
    158166            ;;
    159167        *)
    160             PATH="$PATH" ./configure
     168            PATH="$PATH" ./configure CFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS"
    161169            ;;
    162170    esac
Note: See TracChangeset for help on using the changeset viewer.