From 26b0024e1f629b3c1e98f92657077b58572c5e12 Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 27 Mar 2008 20:23:59 +0000 Subject: merge updates from HEAD --- ChangeLog | 6 ++++++ unix/configure | 2 +- unix/tcl.m4 | 2 +- 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 + + * unix/tcl.m4 (SunOS-5.1x): fix 64bit support for Sun cc. [Bug 1921166] + + * unix/configure: autoconf-2.59 + 2008-03-26 Don Porter * 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 -- cgit v0.12