Fix [https://core.tcl-lang.org/tk/info/1ca3c8d9da|1ca3c8d9da]: nmake build with OPTS=static

3 files changed, 19 insertions, 17 deletions

diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml
index acd0433..469a4b6 100644
--- a/.github/workflows/linux-build.yml
+++ b/.github/workflows/linux-build.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        cfgopt:
+        config:
           - ""
           - "CFLAGS=-DTCL_NO_DEPRECATED=1"
           - "--disable-shared"
@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Install 32-bit dependencies if needed
         # Duplicated from above
-        if: ${{ matrix.cfgopt == 'CFLAGS=-m32 CPPFLAGS=-m32 LDFLAGS=-m32 --disable-64bit' }}
+        if: ${{ matrix.config == 'CFLAGS=-m32 CPPFLAGS=-m32 LDFLAGS=-m32 --disable-64bit' }}
         run: |
           sudo apt-get update
           sudo apt-get install gcc-multilib libc6-dev-i386
@@ -41,12 +41,12 @@ jobs:
         run: |
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
         working-directory: generic
-      - name: Configure ${{ matrix.cfgopt }}
+      - name: Configure ${{ matrix.config }}
         run: |
           mkdir "${HOME}/install dir"
           ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
         env:
-          CFGOPT: ${{ matrix.cfgopt }}
+          CFGOPT: ${{ matrix.config }}
       - name: Build
         run: |
           make all
diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml
index 7119f34..beadff8 100644
--- a/.github/workflows/mac-build.yml
+++ b/.github/workflows/mac-build.yml
@@ -36,7 +36,7 @@ jobs:
     runs-on: macos-11
     strategy:
       matrix:
-        cfgopt:
+        config:
           - ""
           - "--disable-shared"
           - "--enable-symbols"
@@ -54,12 +54,12 @@ jobs:
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
           mkdir "$HOME/install dir"
         working-directory: generic
-      - name: Configure ${{ matrix.cfgopt }}
+      - name: Configure ${{ matrix.config }}
         # Note that macOS is always a 64 bit platform
         run: ./configure --enable-dtrace --enable-framework ${CFGOPT} "--prefix=$HOME/install" || (cat config.log && exit 1)
         env:
           CFLAGS: -arch x86_64 -arch arm64
-          CFGOPT: ${{ matrix.cfgopt }}
+          CFGOPT: ${{ matrix.config }}
       - name: Build
         run: |
           make all tcltest
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 2b772f9..47413f1 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -20,33 +20,35 @@ jobs:
         working-directory: win
     strategy:
       matrix:
-        cfgopt:
+        config:
           - ""
           - "CHECKS=nodep"
           - "OPTS=static"
           - "OPTS=symbols"
           - "OPTS=symbols STATS=compdbg,memdbg"
+          - "OPTS=static,msvcrt"
+          - "OPTS=static,staticpkg,msvcrt"
     # Using powershell means we need to explicitly stop on failure
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Init MSVC
         uses: ilammy/msvc-dev-cmd@v1
-      - name: Build ${{ matrix.cfgopt }}
+      - name: Build ${{ matrix.config }}
         run: |
-          &nmake -f makefile.vc ${{ matrix.cfgopt }} all
+          &nmake -f makefile.vc ${{ matrix.config }} all
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Build Test Harness ${{ matrix.cfgopt }}
+      - name: Build Test Harness ${{ matrix.config }}
         run: |
-          &nmake -f makefile.vc ${{ matrix.cfgopt }} tcltest
+          &nmake -f makefile.vc ${{ matrix.config }} tcltest
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-      - name: Run Tests ${{ matrix.cfgopt }}
+      - name: Run Tests ${{ matrix.config }}
         run: |
-          &nmake -f makefile.vc ${{ matrix.cfgopt }} test
+          &nmake -f makefile.vc ${{ matrix.config }} test
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
@@ -58,7 +60,7 @@ jobs:
         working-directory: win
     strategy:
       matrix:
-        cfgopt:
+        config:
           - ""
           - "CFLAGS=-DTCL_NO_DEPRECATED=1"
           - "--disable-shared"
@@ -79,11 +81,11 @@ jobs:
           touch tclStubInit.c tclOOStubInit.c tclOOScript.h
           mkdir "${HOME}/install dir"
         working-directory: generic
-      - name: Configure ${{ matrix.cfgopt }}
+      - name: Configure ${{ matrix.config }}
         run: |
           ./configure ${CFGOPT} "--prefix=$HOME/install dir" || (cat config.log && exit 1)
         env:
-          CFGOPT: --enable-64bit ${{ matrix.cfgopt }}
+          CFGOPT: --enable-64bit ${{ matrix.config }}
       - name: Build
         run: make all
       - name: Build Test Harness