diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-29 11:18:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-10-29 11:18:19 (GMT) |
| commit | cfe53b8870af9dc22186aadfaec26380ae433716 (patch) | |
| tree | fbb89a866ff59478fa8c9b7a8148e6f5cb093e93 /win/configure | |
| parent | 0df05b3515c7768e0691795986b9fa3bb6116c10 (diff) | |
| parent | 9efaa4d7f1aeb58c52fe41c62713b568a0833948 (diff) | |
| download | tcl-cfe53b8870af9dc22186aadfaec26380ae433716.zip tcl-cfe53b8870af9dc22186aadfaec26380ae433716.tar.gz tcl-cfe53b8870af9dc22186aadfaec26380ae433716.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 5888332..34f163d 100755 --- a/win/configure +++ b/win/configure @@ -4203,7 +4203,7 @@ $as_echo "using shared flags" >&6; } SHLIB_LD='${CC} -shared' SHLIB_LD_LIBS='${LIBS}' MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \$@ ${extra_ldflags} \ - -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\$@)" + -Wl,--out-implib,\$(patsubst %.dll,lib%.dll.a,\$@)" # DLLSUFFIX is separate because it is the building block for # users of tclConfig.sh that may build shared or static. DLLSUFFIX=".dll" @@ -5295,7 +5295,11 @@ eval "TCL_STUB_LIB_SPEC=\"-L${libdir} ${TCL_STUB_LIB_FLAG}\"" eval "TCL_BUILD_STUB_LIB_PATH=\"`$CYGPATH $(pwd)`/${TCL_STUB_LIB_FILE}\"" eval "TCL_STUB_LIB_PATH=\"${libdir}/${TCL_STUB_LIB_FILE}\"" -eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\"" +if test ${SHARED_BUILD} = 0 ; then + eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\"" +else + eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${DLLSUFFIX}.a\"" +fi eval "TCL_BUILD_LIB_SPEC=\"-L`$CYGPATH $(pwd)` -ltcl${VER}${FLAGSUFFIX}\"" eval "TCL_LIB_SPEC=\"-L${libdir} -ltcl${VER}${FLAGSUFFIX}\"" |