Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • box/trunk/infrastructure/makebuildenv.pl.in

    r2947 r2954  
    569569        $include_paths $extra_platform_defines \\ 
    570570        -DBOX_VERSION="\\"$product_version\\"" 
    571 LDFLAGS = @LDFLAGS@ @LDADD_RDYNAMIC@ 
     571LDFLAGS += @LDFLAGS@ @LDADD_RDYNAMIC@ 
    572572 
    573573.ifdef RELEASE 
    574 CXXFLAGS = -DBOX_RELEASE_BUILD $release_flags \$(DEFAULT_CXXFLAGS) 
     574CXXFLAGS += -DBOX_RELEASE_BUILD $release_flags \$(DEFAULT_CXXFLAGS) 
    575575OUTBASE = ../../release 
    576576OUTDIR = ../../release/$mod 
    … …  
    578578VARIENT = RELEASE 
    579579.else 
    580 CXXFLAGS = -g \$(DEFAULT_CXXFLAGS) 
     580CXXFLAGS += -g \$(DEFAULT_CXXFLAGS) 
    581581OUTBASE = ../../debug 
    582582OUTDIR = ../../debug/$mod 
Note: See TracChangeset for help on using the changeset viewer.