diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-13 10:48:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-13 10:48:37 (GMT) |
| commit | 5f79368eafbc887b92115322ec00c4b51f29493c (patch) | |
| tree | bd78b8c23dda4a63404826c79d835e28c5506848 | |
| parent | 711adf15f9783b4b64f76ca82c320afb12d74cdd (diff) | |
| parent | aa7bf1b2e138bde9996a2b899df33b8e3a4f534b (diff) | |
| download | tcl-5f79368eafbc887b92115322ec00c4b51f29493c.zip tcl-5f79368eafbc887b92115322ec00c4b51f29493c.tar.gz tcl-5f79368eafbc887b92115322ec00c4b51f29493c.tar.bz2 | |
Merge 8.6
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 95d9bbb..5ad3d2f 100755 --- a/win/configure +++ b/win/configure @@ -5698,7 +5698,7 @@ 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}\"" -if test ${SHARED_BUILD} = 0 ; then +if test ${SHARED_BUILD} = 0 -o "$GCC" != "yes" ; then eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\"" else eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${DLLSUFFIX}.a\"" diff --git a/win/configure.ac b/win/configure.ac index 85680ad..02b6363 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -327,7 +327,7 @@ 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}\"" -if test ${SHARED_BUILD} = 0 ; then +if test ${SHARED_BUILD} = 0 -o "$GCC" != "yes" ; then eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${LIBSUFFIX}\"" else eval "TCL_LIB_FILE=\"${LIBPREFIX}tcl${VER}${DLLSUFFIX}.a\"" |