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

fix `configure' for 64-bit Mac OS X kernel

Browse Source
This commit is contained in:
Matthew Flatt 2011-02-09 14:38:08 -07:00
parent 9070a4c961
commit 8c0d19fb12
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/configure vendored
View File

@ -5294,10 +5294,11 @@ case $OS in
LD=gcc-4.0 LD=gcc-4.0
fi fi
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
need_cc_in_extras=yes
fi fi
case `$UNAME -m` in case "`$UNAME -m`" in
i386) i386|x86_64)
enable_futures_by_default=yes enable_futures_by_default=yes
;; ;;
*) *)
@ -5337,7 +5338,7 @@ case $OS in
# Force 32-bit build unless mac64 is enabled: # Force 32-bit build unless mac64 is enabled:
if test "${enable_mac64}" != "yes" ; then if test "${enable_mac64}" != "yes" ; then
if test `${UNAME} -m` = "i386" ; then if test "`${UNAME} -m`" != "Power Macintosh" ; then
if test "${ORIG_CC}" = "" ; then if test "${ORIG_CC}" = "" ; then
PREFLAGS="${PREFLAGS} -m32" PREFLAGS="${PREFLAGS} -m32"
CPPFLAGS="${CPPFLAGS} -m32" CPPFLAGS="${CPPFLAGS} -m32"
@ -5345,10 +5346,15 @@ case $OS in
# To make the libffi build work, we have to fold -m32 into CC # To make the libffi build work, we have to fold -m32 into CC
# instead of CFLAGS: # instead of CFLAGS:
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"' -m32"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"' -m32"'
need_cc_in_extras=no
fi fi
fi fi
fi fi
if test "${need_cc_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
fi
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
WXVARIANT="wx_mac" WXVARIANT="wx_mac"
MROPTIONS="$MROPTIONS -fpascal-strings" MROPTIONS="$MROPTIONS -fpascal-strings"

12
src/racket/configure.ac
View File

@ -609,10 +609,11 @@ case $OS in
LD=gcc-4.0 LD=gcc-4.0
fi fi
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CFLAGS="'"'"${CFLAGS} ${PREFLAGS}"'"'
need_cc_in_extras=yes
fi fi
case `$UNAME -m` in case "`$UNAME -m`" in
i386) i386|x86_64)
enable_futures_by_default=yes enable_futures_by_default=yes
;; ;;
*) *)
@ -652,7 +653,7 @@ case $OS in
# Force 32-bit build unless mac64 is enabled: # Force 32-bit build unless mac64 is enabled:
if test "${enable_mac64}" != "yes" ; then if test "${enable_mac64}" != "yes" ; then
if test `${UNAME} -m` = "i386" ; then if test "`${UNAME} -m`" != "Power Macintosh" ; then
if test "${ORIG_CC}" = "" ; then if test "${ORIG_CC}" = "" ; then
PREFLAGS="${PREFLAGS} -m32" PREFLAGS="${PREFLAGS} -m32"
CPPFLAGS="${CPPFLAGS} -m32" CPPFLAGS="${CPPFLAGS} -m32"
@ -660,10 +661,15 @@ case $OS in
# To make the libffi build work, we have to fold -m32 into CC # To make the libffi build work, we have to fold -m32 into CC
# instead of CFLAGS: # instead of CFLAGS:
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"' -m32"' SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"' -m32"'
need_cc_in_extras=no
fi fi
fi fi
fi fi
if test "${need_cc_in_extras}" = "yes" ; then
SUB_CONFIGURE_EXTRAS="${SUB_CONFIGURE_EXTRAS} CC="'"'"${CC}"'"'
fi
if test "${enable_quartz}" = "yes" ; then if test "${enable_quartz}" = "yes" ; then
WXVARIANT="wx_mac" WXVARIANT="wx_mac"
MROPTIONS="$MROPTIONS -fpascal-strings" MROPTIONS="$MROPTIONS -fpascal-strings"