diff options
| author | dgp <dgp@noemail.net> | 2012-09-13 12:37:14 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2012-09-13 12:37:14 (GMT) |
| commit | 5337faabcbbefa6476fc8be1776593398f2db2cd (patch) | |
| tree | 49d86ca1bc767a74d649d0fc3c7413e4363d4824 | |
| parent | 58e189767833b4052782538366b76de2f53b4b99 (diff) | |
| parent | 967d4f910da49283cf5786e2c22ab06ba92c639b (diff) | |
| download | tcl-5337faabcbbefa6476fc8be1776593398f2db2cd.zip tcl-5337faabcbbefa6476fc8be1776593398f2db2cd.tar.gz tcl-5337faabcbbefa6476fc8be1776593398f2db2cd.tar.bz2 | |
merge trunk
FossilOrigin-Name: b052731c8b77f2f669303c615f7627d5300d75d8
| -rw-r--r-- | tests/fileSystem.test | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/fileSystem.test b/tests/fileSystem.test index 38ecbee..b098f35 100644 --- a/tests/fileSystem.test +++ b/tests/fileSystem.test @@ -27,7 +27,7 @@ catch { set ::ddelib [lindex [package ifneeded dde $::ddever] 1] set ::regver [package require registry] set ::reglib [lindex [package ifneeded registry $::regver] 1] - testConstraint loaddll 0 + testConstraint loaddll 1 } # Test for commands defined in Tcltest executable @@ -514,7 +514,7 @@ test filesystem-7.1.1 {load from vfs} -setup { set dir [pwd] } -constraints {win testsimplefilesystem loaddll} -body { # This may cause a crash on exit - cd [file dirname $::reglib] + cd [file dirname $::ddelib] testsimplefilesystem 1 # This loads dde via a complex copy-to-temp operation load simplefs:/[file tail $::ddelib] dde diff --git a/unix/tcl.m4 b/unix/tcl.m4 index a142baf..b13fddd 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1968,7 +1968,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ AS_IF([test "$GCC" = yes],[use_sunmath=no],[ arch=`isainfo` AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) - AS_IF([test "$arch" = "amd64 i386"], [ + AS_IF([test "$arch" = "amd64 i386" -o "$arch" = "i386"], [ AC_MSG_RESULT([yes]) MATH_LIBS="-lsunmath $MATH_LIBS" AC_CHECK_HEADER(sunmath.h) @@ -2001,7 +2001,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ], [ AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) 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";; |