summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-03 14:19:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-06-03 14:19:43 (GMT)
commit596b5e9c70fd7bbef2a6d801c647bb939482961a (patch)
tree22302e5580b087cf26b100a18a984a9d0c5c3ebc
parent69c9746bd1fb5d903ee327444835805a4a99786f (diff)
downloadtcl-596b5e9c70fd7bbef2a6d801c647bb939482961a.zip
tcl-596b5e9c70fd7bbef2a6d801c647bb939482961a.tar.gz
tcl-596b5e9c70fd7bbef2a6d801c647bb939482961a.tar.bz2
last-moment fix for FreeBSD from Pietro Cerutti
-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 ec5298c..36d7b8d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -3425,14 +3425,14 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
# 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=""
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
# The -pthread needs to go in the LDFLAGS, not LIBS
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 85b8f82..45d19ae 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1564,14 +1564,14 @@ dnl AC_CHECK_TOOL(AR, ar)
# 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=""
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
# The -pthread needs to go in the LDFLAGS, not LIBS