diff options
| author | dgp <dgp@users.sourceforge.net> | 2012-09-11 13:59:52 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2012-09-11 13:59:52 (GMT) |
| commit | 91b969d13eb7acfd52a0e5404b811c09a185a62a (patch) | |
| tree | 55b09905a787a1734d9022d3133de66c09656b0f /unix/tcl.m4 | |
| parent | 183d093ed0f015d721d963c7cff2f07f5a72af72 (diff) | |
| download | tk-91b969d13eb7acfd52a0e5404b811c09a185a62a.zip tk-91b969d13eb7acfd52a0e5404b811c09a185a62a.tar.gz tk-91b969d13eb7acfd52a0e5404b811c09a185a62a.tar.bz2 | |
contributed patch for Solaris 9/x86 support
Diffstat (limited to 'unix/tcl.m4')
| -rw-r--r-- | unix/tcl.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 3974753..de1c98c 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1961,6 +1961,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ], [ do64bit_ok=yes case $system in +# Non functional check, m64/xarch depends on compiler not os version SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) CFLAGS="$CFLAGS -m64" LDFLAGS="$LDFLAGS -m64";; @@ -1979,7 +1980,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) @@ -2012,13 +2013,13 @@ 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";; esac CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}' ]) ;; UNIX_SV* | UnixWare-5*) @@ -2103,7 +2104,7 @@ dnl # preprocessing tests use only CPPFLAGS. AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' + MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" |