summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-01-29 02:18:56 (GMT)
committerhobbs <hobbs>2005-01-29 02:18:56 (GMT)
commit42d2f68b0c441a5ca00d0fb6ff8e7f589d6502a6 (patch)
tree90e2d69d160a0506f24bb227faa6c02c52a49090
parente538470aa3811dd335a03635a14ef8a9aabb6918 (diff)
downloadtk-42d2f68b0c441a5ca00d0fb6ff8e7f589d6502a6.zip
tk-42d2f68b0c441a5ca00d0fb6ff8e7f589d6502a6.tar.gz
tk-42d2f68b0c441a5ca00d0fb6ff8e7f589d6502a6.tar.bz2
correct autoconf generation for sol64-gcc support
-rwxr-xr-xunix/configure8
-rw-r--r--unix/tcl.m48
2 files changed, 8 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure
index 9f4652e..fd5b380 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2957,13 +2957,13 @@ EOF
SHLIB_CFLAGS="-KPIC"
-
+
# Check to enable 64-bit flags for compiler/linker
if test "$do64bit" = "yes" ; then
arch=`isainfo`
if test "$arch" = "sparcv9 sparc" ; then
if test "$GCC" = "yes" ; then
- if test "`gcc -dumpversion` | awk -F. '{print }'" -lt "3" ; then
+ if test "`gcc -dumpversion | awk -F. '{print $1}'`" -lt "3" ; then
echo "configure: warning: 64bit mode not supported with GCC < 3.2 on $system" 1>&2
else
do64bit_ok=yes
@@ -3000,7 +3000,7 @@ EOF
SHLIB_LD="$CC -shared"
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- if test "$do64bit" = "yes" ; then
+ if test "$do64bit_ok" = "yes" ; then
# We need to specify -static-libgcc or we need to
# add the path to the sparv9 libgcc.
SHLIB_LD="$SHLIB_LD -m64 -mcpu=v9 -static-libgcc"
@@ -3067,7 +3067,7 @@ rm -f conftest*
esac
if test "$do64bit" = "yes" -a "$do64bit_ok" = "no" ; then
- echo "configure: warning: "64bit support being disabled -- don\'t know magic for this platform"" 1>&2
+ echo "configure: warning: 64bit support being disabled -- don't know magic for this platform" 1>&2
fi
# Step 4: If pseudo-static linking is in use (see K. B. Kenny, "Dynamic
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index af4f8e4..bc1025b 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1571,13 +1571,13 @@ dnl AC_CHECK_TOOL(AR, ar)
AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
SHLIB_CFLAGS="-KPIC"
-
+
# Check to enable 64-bit flags for compiler/linker
if test "$do64bit" = "yes" ; then
arch=`isainfo`
if test "$arch" = "sparcv9 sparc" ; then
if test "$GCC" = "yes" ; then
- if test "`gcc -dumpversion` | awk -F. '{print $1}'" -lt "3" ; then
+ if test "`gcc -dumpversion | awk -F. '{print [$]1}'`" -lt "3" ; then
AC_MSG_WARN([64bit mode not supported with GCC < 3.2 on $system])
else
do64bit_ok=yes
@@ -1614,7 +1614,7 @@ dnl AC_CHECK_TOOL(AR, ar)
SHLIB_LD="$CC -shared"
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- if test "$do64bit" = "yes" ; then
+ if test "$do64bit_ok" = "yes" ; then
# We need to specify -static-libgcc or we need to
# add the path to the sparv9 libgcc.
SHLIB_LD="$SHLIB_LD -m64 -mcpu=v9 -static-libgcc"
@@ -1664,7 +1664,7 @@ dnl AC_CHECK_TOOL(AR, ar)
esac
if test "$do64bit" = "yes" -a "$do64bit_ok" = "no" ; then
- AC_MSG_WARN("64bit support being disabled -- don\'t know magic for this platform")
+ AC_MSG_WARN([64bit support being disabled -- don't know magic for this platform])
fi
# Step 4: If pseudo-static linking is in use (see K. B. Kenny, "Dynamic