diff options
| author | dgp <dgp@users.sourceforge.net> | 2020-10-29 19:34:55 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2020-10-29 19:34:55 (GMT) |
| commit | 49268667e232db7125236473103954265de49a5a (patch) | |
| tree | abcf52e9bd2bacb65932e34392ac027fb9a14328 /win/configure | |
| parent | f9867210201c135f502c237dc2d1d4623e4d0d58 (diff) | |
| parent | 9efaa4d7f1aeb58c52fe41c62713b568a0833948 (diff) | |
| download | tcl-49268667e232db7125236473103954265de49a5a.zip tcl-49268667e232db7125236473103954265de49a5a.tar.gz tcl-49268667e232db7125236473103954265de49a5a.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 3f09a30..5df540b 100755 --- a/win/configure +++ b/win/configure @@ -3584,7 +3584,7 @@ echo "$as_me: error: ${CC} does not support the -shared option. 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="\${DBGX}.dll" @@ -5075,7 +5075,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}\"" |