suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch Mac OS X build default (32-bit vs 64-bit) to compiler default

Browse Source 
That means the default is 64-bit for a typical Mac OS X 10.6 or 10.7
installation.
This commit is contained in:
Matthew Flatt 2011-10-19 15:32:13 -06:00
parent 210a6f329e
commit 245f45d183
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collects/meta/build/build
View File

@ -85,12 +85,12 @@ defbuild "pitcairn2" "x86_64-win32" "test_gui=yes" \
"workdir=C:/build" # same here (see also commit log!) "workdir=C:/build" # same here (see also commit log!)
# The LDFLAGS is a workaround for a bug in Fink, see # The LDFLAGS is a workaround for a bug in Fink, see
# http://wiki.finkproject.org/index.php/Fink:Packaging:Preparing_for_10.5#OpenGL_Bug # http://wiki.finkproject.org/index.php/Fink:Packaging:Preparing_for_10.5#OpenGL_Bug
defbuild "kauai" "ppc-darwin" "configure_args=--enable-xonx" \ defbuild "kauai" "ppc-darwin" "configure_args='--enable-xonx --disable-mac64'" \
"LDFLAGS=-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib" "LDFLAGS=-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
defbuild "weatherwax" "ppc-osx-mac" \ defbuild "weatherwax" "ppc-osx-mac" \
"configure_args=--enable-sdk=/Developer/SDKs/MacOSX10.4u.sdk" "configure_args=--enable-sdk=/Developer/SDKs/MacOSX10.4u.sdk"
defbuild "macintel" "i386-osx-mac" \ defbuild "macintel" "i386-osx-mac" \
"configure_args=--enable-sdk=/Developer/SDKs/MacOSX10.4u.sdk" "configure_args='--enable-sdk=/Developer/SDKs/MacOSX10.4u.sdk --disable-mac64'"
# defbuild "galaga" "i386-linux-ubuntu-hardy" # defbuild "galaga" "i386-linux-ubuntu-hardy"
defbuild "champlain" "i386-linux-f12" defbuild "champlain" "i386-linux-f12"
defbuild "ccs-linux" "i386-linux-ubuntu-karmic" "moveto=/proj/racket" defbuild "ccs-linux" "i386-linux-ubuntu-karmic" "moveto=/proj/racket"
@ -104,7 +104,7 @@ defbuild "ccs-linux" "i386-linux-ubuntu-karmic" "moveto=/proj/racket"
defbuild "blisses1" "x86_64-linux-debian-lenny" defbuild "blisses1" "x86_64-linux-debian-lenny"
defbuild "blisses2" "x86_64-linux-debian-squeeze" defbuild "blisses2" "x86_64-linux-debian-squeeze"
# And this is from Stephen De Gabrielle <stephen.degabrielle at acm dot org> # And this is from Stephen De Gabrielle <stephen.degabrielle at acm dot org>
defbuild "osx64" "x86_64-osx-mac" "configure_args=--enable-mac64" defbuild "osx64" "x86_64-osx-mac"
# Start the main build last # Start the main build last
defbuild "$workmachine" "x86_64-linux-f14" "copytobak=$maindir" "test_gui=yes" defbuild "$workmachine" "x86_64-linux-f14" "copytobak=$maindir" "test_gui=yes"
msets "/" msets "/"

5
src/README
View File

@ -68,9 +68,8 @@ the Unix instructions below, but note the following:
directory structure on top of an existing Unix-style directory directory structure on top of an existing Unix-style directory
structure.) structure.)
* Under Mac OS X 10.6 and later, `configure' by default selects * Under Mac OS X 10.6 and later, to build Racket in 32-bit mode,
32-bit mode for building Racket. To build Racket in 64-bit mode, use `--disable-mac64'.
use `--enable-mac64'.
======================================================================== ========================================================================
Compiling for supported Unix variants (including Linux) or Cygwin Compiling for supported Unix variants (including Linux) or Cygwin

6
src/configure vendored
View File

@ -1349,7 +1349,7 @@ Optional Features:
--enable-libfw install Mac OS X frameworks to /Library/Frameworks --enable-libfw install Mac OS X frameworks to /Library/Frameworks
--enable-userfw install Mac OS X frameworks to ~/Library/Frameworks --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks
--enable-macprefix allow --prefix with a Mac OS X install --enable-macprefix allow --prefix with a Mac OS X install
--enable-mac64 do not force 32-bit build --enable-mac64 allow 64-bit Mac OS X build (enabled by default)
--enable-cgcdefault use CGC (Boehm or Senora) as default build --enable-cgcdefault use CGC (Boehm or Senora) as default build
--enable-sgc use Senora GC instead of the Boehm GC --enable-sgc use Senora GC instead of the Boehm GC
--enable-sgcdebug use Senora GC for debugging --enable-sgcdebug use Senora GC for debugging
@ -2084,6 +2084,8 @@ fi
# Check whether --enable-mac64 was given. # Check whether --enable-mac64 was given.
if test "${enable_mac64+set}" = set; then if test "${enable_mac64+set}" = set; then
enableval=$enable_mac64; enableval=$enable_mac64;
else
enable_mac64=yes
fi fi
@ -2345,7 +2347,7 @@ show_explicitly_enabled "${enable_gcov}" "gcov"
show_explicitly_enabled "${enable_noopt}" "No-optimization" show_explicitly_enabled "${enable_noopt}" "No-optimization"
show_explicitly_enabled "${enable_mac64}" "64-bit Mac OS X" show_explicitly_disabled "${enable_mac64}" "64-bit Mac OS X"
show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system"
show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user" show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user"

4
src/racket/configure.ac
View File

@ -52,7 +52,7 @@ AC_ARG_ENABLE(xonx, [ --enable-xonx use Unix style (e.g., use Gtk)
AC_ARG_ENABLE(libfw, [ --enable-libfw install Mac OS X frameworks to /Library/Frameworks]) AC_ARG_ENABLE(libfw, [ --enable-libfw install Mac OS X frameworks to /Library/Frameworks])
AC_ARG_ENABLE(libfw, [ --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks]) AC_ARG_ENABLE(libfw, [ --enable-userfw install Mac OS X frameworks to ~/Library/Frameworks])
AC_ARG_ENABLE(macprefix, [ --enable-macprefix allow --prefix with a Mac OS X install]) AC_ARG_ENABLE(macprefix, [ --enable-macprefix allow --prefix with a Mac OS X install])
AC_ARG_ENABLE(mac64, [ --enable-mac64 do not force 32-bit build]) AC_ARG_ENABLE(mac64, [ --enable-mac64 allow 64-bit Mac OS X build (enabled by default)], , enable_mac64=yes)
AC_ARG_ENABLE(cgcdefault, [ --enable-cgcdefault use CGC (Boehm or Senora) as default build]) AC_ARG_ENABLE(cgcdefault, [ --enable-cgcdefault use CGC (Boehm or Senora) as default build])
AC_ARG_ENABLE(sgc, [ --enable-sgc use Senora GC instead of the Boehm GC]) AC_ARG_ENABLE(sgc, [ --enable-sgc use Senora GC instead of the Boehm GC])
@ -272,7 +272,7 @@ show_explicitly_enabled "${enable_gcov}" "gcov"
show_explicitly_enabled "${enable_noopt}" "No-optimization" show_explicitly_enabled "${enable_noopt}" "No-optimization"
show_explicitly_enabled "${enable_mac64}" "64-bit Mac OS X" show_explicitly_disabled "${enable_mac64}" "64-bit Mac OS X"
show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system" show_explicitly_enabled "${enable_libfw}" "Frameworks-to-system"
show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user" show_explicitly_enabled "${enable_userfw}" "Frameworks-to-user"