diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-02 11:31:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-02 11:31:01 (GMT) |
| commit | 1adac52046321a2cd3c2dca5c9fc384666e34e18 (patch) | |
| tree | f961049f6c94a2d285c4d733ea7713ed15338972 | |
| parent | 7c3b884ac2d10d1ca50e15b96506b6eda5e04442 (diff) | |
| parent | 15449e71fb0e333a91a7bb2b8e4fabfc1f98f597 (diff) | |
| download | tcl-1adac52046321a2cd3c2dca5c9fc384666e34e18.zip tcl-1adac52046321a2cd3c2dca5c9fc384666e34e18.tar.gz tcl-1adac52046321a2cd3c2dca5c9fc384666e34e18.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | .github/workflows/win-build.yml | 19 | ||||
| -rwxr-xr-x | unix/configure | 8 | ||||
| -rw-r--r-- | unix/tcl.m4 | 8 | ||||
| -rwxr-xr-x | win/configure | 8 | ||||
| -rw-r--r-- | win/tcl.m4 | 8 |
5 files changed, 13 insertions, 38 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 9cc8ed4..9615e85 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -7,27 +7,34 @@ jobs: run: shell: powershell working-directory: win + strategy: + matrix: + cfgopt: + - "" + - "OPTS=static,msvcrt" + - "OPTS=symbols" + - "OPTS=memdbg" # Using powershell means we need to explicitly stop on failure steps: - name: Checkout uses: actions/checkout@v2 - name: Init MSVC uses: ilammy/msvc-dev-cmd@v1 - - name: Build + - name: Build ${{ matrix.cfgopt }} run: | - &nmake -f makefile.vc all + &nmake -f makefile.vc ${{ matrix.cfgopt }} all if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } - - name: Build Test Harness + - name: Build Test Harness ${{ matrix.cfgopt }} run: | - &nmake -f makefile.vc tcltest + &nmake -f makefile.vc ${{ matrix.cfgopt }} tcltest if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } - - name: Run Tests + - name: Run Tests ${{ matrix.cfgopt }} run: | - &nmake -f makefile.vc test + &nmake -f makefile.vc ${{ matrix.cfgopt }} test if ($lastexitcode -ne 0) { throw "nmake exit code: $lastexitcode" } diff --git a/unix/configure b/unix/configure index 8c1cded..473ac13 100755 --- a/unix/configure +++ b/unix/configure @@ -4483,14 +4483,6 @@ else tcl_ok=yes fi - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5 $as_echo "shared" >&6; } diff --git a/unix/tcl.m4 b/unix/tcl.m4 index c32874b..c9d9e3a 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -511,14 +511,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_HELP_STRING([--enable-shared], [build and link with shared libraries (default: on)]), [tcl_ok=$enableval], [tcl_ok=yes]) - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then AC_MSG_RESULT([shared]) SHARED_BUILD=1 diff --git a/win/configure b/win/configure index 7a749a3..89bec9f 100755 --- a/win/configure +++ b/win/configure @@ -3769,14 +3769,6 @@ else tcl_ok=yes fi - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5 $as_echo "shared" >&6; } @@ -358,14 +358,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_ARG_ENABLE(shared, [ --enable-shared build and link with shared libraries (default: on)], [tcl_ok=$enableval], [tcl_ok=yes]) - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then AC_MSG_RESULT([shared]) SHARED_BUILD=1 |