summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-09-13 15:55:15 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-09-13 15:55:15 (GMT)
commit975546b642ad400383e0a41fe2ec3a20676836c1 (patch)
treeb298209812d12bb0cccc1a1087941e34b7b4a451
parent2ba5e62a843dbfad2aca43306c3fb6f292ca8552 (diff)
parentd8906fe61c74c92382870cd6a2072d3417921ad8 (diff)
downloadtcl-975546b642ad400383e0a41fe2ec3a20676836c1.zip
tcl-975546b642ad400383e0a41fe2ec3a20676836c1.tar.gz
tcl-975546b642ad400383e0a41fe2ec3a20676836c1.tar.bz2
merge trunk
-rwxr-xr-xunix/configure4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure
index 5c1124c..0958d3d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8757,7 +8757,7 @@ else
arch=`isainfo`
echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5
echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6
- if test "$arch" = "amd64 i386"; then
+ if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
@@ -8956,7 +8956,7 @@ else
fi
case $system in
- SunOS-5.[1-9][0-9]*)
+ SunOS-5.[1-9][0-9]*|SunOS-5.[7-9])
SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";;
*)
SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";;