summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-09-12 23:28:30 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-09-12 23:28:30 (GMT)
commit11b6640a79a74173f3050f4d2e7a5a794a404bce (patch)
tree5830ba7652a97b2459cdeb0b61894a0722b31205
parent91b969d13eb7acfd52a0e5404b811c09a185a62a (diff)
downloadtk-11b6640a79a74173f3050f4d2e7a5a794a404bce.zip
tk-11b6640a79a74173f3050f4d2e7a5a794a404bce.tar.gz
tk-11b6640a79a74173f3050f4d2e7a5a794a404bce.tar.bz2
post-review, believed minimalbug_3566106
-rw-r--r--unix/tcl.m45
1 files changed, 2 insertions, 3 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index de1c98c..9ca88f1 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1961,7 +1961,6 @@ 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";;
@@ -2019,7 +2018,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";;
esac
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
])
;;
UNIX_SV* | UnixWare-5*)
@@ -2104,7 +2103,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} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}'
+ MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [
INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"'
DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"