summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2013-06-03 20:31:58 (GMT)
committerdgp <dgp@users.sourceforge.net>2013-06-03 20:31:58 (GMT)
commit60c6195c4c60a3493f13ecb118fe433cfbd4af98 (patch)
tree2819b0d8c05dd43fd8ef3bf605159257243774f3 /unix
parentbcc20b58f79b107e5877ba74855fd4f5b6f567df (diff)
parent68d9ec32251e4fef72df8960441ff9784a7b8381 (diff)
downloadtcl-60c6195c4c60a3493f13ecb118fe433cfbd4af98.zip
tcl-60c6195c4c60a3493f13ecb118fe433cfbd4af98.tar.gz
tcl-60c6195c4c60a3493f13ecb118fe433cfbd4af98.tar.bz2
merge 8.5
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m44
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index 46b9843..583cd01 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7840,7 +7840,7 @@ fi
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$@"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -7848,7 +7848,7 @@ fi
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
fi
if test "${TCL_THREADS}" = "1"; then
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index ea7fcc7..cc7c936 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1550,14 +1550,14 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
# This configuration from FreeBSD Ports.
SHLIB_CFLAGS="-fPIC"
SHLIB_LD="${CC} -shared"
- TCL_SHLIB_LD_EXTRAS="-Wl,-soname \$[@]"
+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]"
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS=""
AS_IF([test $doRpath = yes], [
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
AS_IF([test "${TCL_THREADS}" = "1"], [
# The -pthread needs to go in the LDFLAGS, not LIBS
LIBS=`echo $LIBS | sed s/-pthread//`