Skip to content

Commit 74f0e0c

Browse files
author
jan.nijtmans
committed
Don't use ${LIB_FILE} in SHLIB_LD on Cygwin
1 parent 5afc560 commit 74f0e0c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

unix/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4780,7 +4780,7 @@ fi
47804780
;;
47814781
CYGWIN_*|MINGW32_*|MSYS_*)
47824782
SHLIB_CFLAGS="-fno-common"
4783-
SHLIB_LD='${CC} -shared -Wl,--out-implib,$(patsubst cyg%.dll,lib%.dll.a,${LIB_FILE})'
4783+
SHLIB_LD='${CC} -shared -Wl,--out-implib,$(patsubst cyg%.dll,lib%.dll.a,$@)'
47844784
SHLIB_SUFFIX=".dll"
47854785
DL_OBJS="tclLoadDl.o"
47864786
PLAT_OBJS='${CYGWIN_OBJS}'

unix/tcl.m4

Lines changed: 2 additions & 2 deletions
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 -Wl,--out-implib,$(patsubst cyg%.dll,lib%.dll.a,${LIB_FILE})'
1082+
SHLIB_LD='${CC} -shared -Wl,--out-implib,$(patsubst cyg%.dll,lib%.dll.a,$[@])'
10831083
SHLIB_SUFFIX=".dll"
10841084
DL_OBJS="tclLoadDl.o"
10851085
PLAT_OBJS='${CYGWIN_OBJS}'
@@ -2087,7 +2087,7 @@ AC_DEFUN([SC_TIME_HANDLER], [
20872087
AC_CHECK_HEADERS(sys/time.h)
20882088
AC_CHECK_HEADERS_ONCE([sys/time.h])
20892089
2090-
AC_CHECK_FUNCS(gmtime_r localtime_r mktime)
2090+
AC_CHECK_FUNCS(gmtime_r localtime_r)
20912091
20922092
AC_CACHE_CHECK([tm_tzadj in struct tm], tcl_cv_member_tm_tzadj, [
20932093
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>]], [[struct tm tm; (void)tm.tm_tzadj;]])],

0 commit comments

Comments
 (0)