summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-03-27 20:23:59 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-03-27 20:23:59 (GMT)
commit26b0024e1f629b3c1e98f92657077b58572c5e12 (patch)
tree22055871e6d7e305392177a98f2365fafb0d85fb
parent7d09862213dc5b81ab51ab699129f8dc0add0693 (diff)
downloadtcl-26b0024e1f629b3c1e98f92657077b58572c5e12.zip
tcl-26b0024e1f629b3c1e98f92657077b58572c5e12.tar.gz
tcl-26b0024e1f629b3c1e98f92657077b58572c5e12.tar.bz2
merge updates from HEAD
-rw-r--r--ChangeLog6
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a5b666..26d9351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-27 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/tcl.m4 (SunOS-5.1x): fix 64bit support for Sun cc. [Bug 1921166]
+
+ * unix/configure: autoconf-2.59
+
2008-03-26 Don Porter <dgp@users.sourceforge.net>
* changes: Updated for 8.5.2 release.
diff --git a/unix/configure b/unix/configure
index a822dc2..099969b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8481,7 +8481,7 @@ else
case $system in
SunOS-5.[1-9][0-9]*)
- SHLIB_LD='${CC} -G -z text';;
+ SHLIB_LD='${CC} -G -z text ${LDFLAGS}';;
*)
SHLIB_LD='/usr/ccs/bin/ld -G -z text';;
esac
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 3a13ea3..0b69ba0 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1954,7 +1954,7 @@ dnl AC_CHECK_TOOL(AR, ar)
], [
case $system in
SunOS-5.[[1-9]][[0-9]]*)
- SHLIB_LD='${CC} -G -z text';;
+ SHLIB_LD='${CC} -G -z text ${LDFLAGS}';;
*)
SHLIB_LD='/usr/ccs/bin/ld -G -z text';;
esac