diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-17 12:07:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-17 12:07:17 (GMT) |
| commit | 54198747bb48292d91a43b0e328aebb6d8eaa1df (patch) | |
| tree | 6f85c157663440de2f3dd429f7f26ba287d1ef6f /unix | |
| parent | dabd6dee2d365e65a816652ccb036c9f817debfa (diff) | |
| parent | 36024b4c2dfa88a5b42c42342e1630cb846b59f0 (diff) | |
| download | tcl-54198747bb48292d91a43b0e328aebb6d8eaa1df.zip tcl-54198747bb48292d91a43b0e328aebb6d8eaa1df.tar.gz tcl-54198747bb48292d91a43b0e328aebb6d8eaa1df.tar.bz2 | |
Merge 9.0
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 3 | ||||
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index b92d2fb..6f67c37 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2336,7 +2336,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in gen $(TOP_DIR)/win/tcl.m4 $(TOP_DIR)/win/aclocal.m4 \ $(TOP_DIR)/win/tclsh.exe.manifest.in $(TOP_DIR)/win/tclUuid.h.in \ $(TOP_DIR)/win/gitmanifest.in $(TOP_DIR)/win/svnmanifest.in \ - $(DISTDIR)/win + $(TOP_DIR)/win/x86_64-w64-mingw32-nmakehlp.exe $(DISTDIR)/win + chmod 775 $(DISTDIR)/win/x86_64-w64-mingw32-nmakehlp.exe $(DIST_INSTALL_SCRIPT) $(TOP_DIR)/win/configure $(DISTDIR)/win $(DIST_INSTALL_DATA) $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \ $(DISTDIR)/win diff --git a/unix/configure b/unix/configure index 429c42e..d06650d 100755 --- a/unix/configure +++ b/unix/configure @@ -6761,11 +6761,11 @@ printf "%s\n" "#define _OE_SOCKETS 1" >>confdefs.h if test "$SHARED_BUILD" = 1 then : - SHLIB_LD='ld -shared -expect_unresolved "*"' + SHLIB_LD='${CC} -shared' else $as_nop - SHLIB_LD='ld -non_shared -expect_unresolved "*"' + SHLIB_LD='${CC} -non_shared' fi SHLIB_SUFFIX=".so" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 74dc5ce..6b88e88 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1515,9 +1515,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # Digital OSF/1 SHLIB_CFLAGS="" AS_IF([test "$SHARED_BUILD" = 1], [ - SHLIB_LD='ld -shared -expect_unresolved "*"' + SHLIB_LD='${CC} -shared' ], [ - SHLIB_LD='ld -non_shared -expect_unresolved "*"' + SHLIB_LD='${CC} -non_shared' ]) SHLIB_SUFFIX=".so" DL_OBJS="tclLoadDl.o" |