summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authordas <das>2006-12-19 01:20:11 (GMT)
committerdas <das>2006-12-19 01:20:11 (GMT)
commit4d7afe0cbb46969e094064103adb27ea8afb9371 (patch)
treec6cfe160adb1c80209dcd8bd98323873a4dc890c /unix/tcl.m4
parentc9c03d96774a94bcba6c4b290251e5e20f921890 (diff)
downloadtk-4d7afe0cbb46969e094064103adb27ea8afb9371.zip
tk-4d7afe0cbb46969e094064103adb27ea8afb9371.tar.gz
tk-4d7afe0cbb46969e094064103adb27ea8afb9371.tar.bz2
* unix/tcl.m4 (Darwin): --enable-64bit: verify linking with 64bit -arch
flag succeeds before enabling 64bit build. * unix/configure: autoconf-2.13
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m428
1 files changed, 23 insertions, 5 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index f3d9f1b..13f533a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1560,15 +1560,33 @@ dnl AC_CHECK_TOOL(AR, ar)
CFLAGS_OPTIMIZE="-Os"
SHLIB_CFLAGS="-fno-common"
if test $do64bit = yes; then
- do64bit_ok=yes
case `arch` in
ppc)
- CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5";;
+ AC_CACHE_CHECK([if compiler accepts -arch ppc64 flag],
+ tcl_cv_cc_arch_ppc64, [
+ hold_cflags=$CFLAGS
+ CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+ AC_TRY_LINK(,, tcl_cv_cc_arch_ppc64=yes,
+ tcl_cv_cc_arch_ppc64=no)
+ CFLAGS=$hold_cflags])
+ if test $tcl_cv_cc_arch_ppc64 = yes; then
+ CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+ do64bit_ok=yes
+ fi;;
i386)
- CFLAGS="$CFLAGS -arch x86_64";;
+ AC_CACHE_CHECK([if compiler accepts -arch x86_64 flag],
+ tcl_cv_cc_arch_x86_64, [
+ hold_cflags=$CFLAGS
+ CFLAGS="$CFLAGS -arch x86_64"
+ AC_TRY_LINK(,, tcl_cv_cc_arch_x86_64=yes,
+ tcl_cv_cc_arch_x86_64=no)
+ CFLAGS=$hold_cflags])
+ if test $tcl_cv_cc_arch_x86_64 = yes; then
+ CFLAGS="$CFLAGS -arch x86_64"
+ do64bit_ok=yes
+ fi;;
*)
- AC_MSG_WARN([Don't know how enable 64-bit on architecture `arch`])
- do64bit_ok=no;;
+ AC_MSG_WARN([Don't know how enable 64-bit on architecture `arch`]);;
esac
else
# Check for combined 32-bit and 64-bit fat build