Skip to content

Commit 8d35c74

Browse files
author
jan.nijtmans
committed
Fix [17960b80db]: Missing libtcl?.?.dll.a in Cygwin
1 parent f29ba4c commit 8d35c74

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ to the userbase.
1919
- [Panic "Buffer Underflow, BUFFER_PADDING not enough"](https://core.tcl-lang.org/tcl/tktview/73bb42)
2020
- [MS-VS build system: pckIndex.tcl when building for 9 misses "t" for TCL 8.6 part](https://core.tcl-lang.org/tcl/tktview/a77029)
2121
- [clock format -locale does not look up locale children if parent locale used first](https://core.tcl-lang.org/tcl/tktview/2c0f49)
22+
- [Missing libtcl?.?.dll.a in Cygwin](https://core.tcl-lang.org/tcl/tktview/dcedba)
2223

2324
# Incompatibilities
2425
- No known incompatibilities with the Tcl 9.0.0 public interface.

unix/configure

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5950,7 +5950,7 @@ fi
59505950
;;
59515951
CYGWIN_*|MINGW32_*|MSYS_*)
59525952
SHLIB_CFLAGS="-fno-common"
5953-
SHLIB_LD='${CC} -shared'
5953+
SHLIB_LD='${CC} -shared -Wl,--out-implib,$(patsubst cyg%.dll,lib%.dll.a,${LIB_FILE})'
59545954
SHLIB_SUFFIX=".dll"
59555955
DL_OBJS="tclLoadDl.o"
59565956
PLAT_OBJS='${CYGWIN_OBJS}'
@@ -10955,7 +10955,12 @@ fi
1095510955

1095610956
TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
1095710957
TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
10958+
if test "$ac_cv_cygwin" = "yes" -a "$SHARED_BUILD" != "0"; then
10959+
eval "TCL_LIB_FILE=cygtcl${LIB_SUFFIX}"
10960+
EXTRA_INSTALL_BINARIES='$(INSTALL_LIBRARY) $(patsubst cyg%.dll,lib%.dll.a,${LIB_FILE}) "$(LIB_INSTALL_DIR)"'
10961+
else
1095810962
eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
10963+
fi
1095910964

1096010965
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
1096110966
# since on some platforms TCL_LIB_FILE contains shell escapes.

unix/configure.ac

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,12 @@ fi
717717

718718
TCL_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
719719
TCL_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}
720+
if test "$ac_cv_cygwin" = "yes" -a "$SHARED_BUILD" != "0"; then
721+
eval "TCL_LIB_FILE=cygtcl${LIB_SUFFIX}"
722+
EXTRA_INSTALL_BINARIES='$(INSTALL_LIBRARY) $(patsubst cyg%.dll,lib%.dll.a,${LIB_FILE}) "$(LIB_INSTALL_DIR)"'
723+
else
720724
eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
725+
fi
721726

722727
# tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
723728
# since on some platforms TCL_LIB_FILE contains shell escapes.

unix/tcl.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1079,7 +1079,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
10791079
;;
10801080
CYGWIN_*|MINGW32_*|MSYS_*)
10811081
SHLIB_CFLAGS="-fno-common"
1082-
SHLIB_LD='${CC} -shared'
1082+
SHLIB_LD='${CC} -shared -Wl,--out-implib,$(patsubst cyg%.dll,lib%.dll.a,${LIB_FILE})'
10831083
SHLIB_SUFFIX=".dll"
10841084
DL_OBJS="tclLoadDl.o"
10851085
PLAT_OBJS='${CYGWIN_OBJS}'

0 commit comments

Comments
 (0)