diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-01-25 21:37:24 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-01-25 21:37:24 (GMT) |
| commit | 53dc4635d0bf64085467f976a07067844f7016c7 (patch) | |
| tree | 48ddeb7f47b8c3af59f3c8a13b707a2dec7bbaa4 | |
| parent | a30279739b3a8f30696b44c63ea6780453099f5c (diff) | |
| parent | 20bc7221f1c2e775d754f2e3616c8dd961c1481b (diff) | |
| download | tk-53dc4635d0bf64085467f976a07067844f7016c7.zip tk-53dc4635d0bf64085467f976a07067844f7016c7.tar.gz tk-53dc4635d0bf64085467f976a07067844f7016c7.tar.bz2 | |
Fix TK_SHLIB_LD_EXTRAS for FreeBSD (and Cygwin), reported by Pietro Cerutti
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure index de9eaa9..ab4f9f6 100755 --- a/unix/configure +++ b/unix/configure @@ -4853,6 +4853,7 @@ fi TCL_NEEDS_EXP_FILE=1 TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a' + TK_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a' echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5 echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6 if test "${ac_cv_cygwin+set}" = set; then @@ -5586,6 +5587,7 @@ fi SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$@" + TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 8c29334..25137d0 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1217,7 +1217,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LD_SEARCH_FLAGS="" TCL_NEEDS_EXP_FILE=1 TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' - TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$[@].a' + SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,$[@].a" + TK_SHLIB_LD_EXTRAS='-Wl,--out-implib,$[@].a' AC_CACHE_CHECK(for Cygwin version of gcc, ac_cv_cygwin, AC_TRY_COMPILE([ @@ -1530,7 +1531,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # This configuration from FreeBSD Ports. SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC} -shared" - TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$[@]" + SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname=\$[@]" + TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$[@]" SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" DL_LIBS="" |