diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-11 14:22:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-11 14:22:09 (GMT) |
| commit | 85cb8c27f27b0f3dab72ab181ba1bed5400e13e5 (patch) | |
| tree | 27917ed6eb25714e1823ea6c833850f502111667 | |
| parent | ba54e38a0afa1b848c4651ed5a5f1dee5cd6480f (diff) | |
| download | tcl-85cb8c27f27b0f3dab72ab181ba1bed5400e13e5.zip tcl-85cb8c27f27b0f3dab72ab181ba1bed5400e13e5.tar.gz tcl-85cb8c27f27b0f3dab72ab181ba1bed5400e13e5.tar.bz2 | |
See [https://github.com/tcltk/tcl/pull/11], but (hopefully) slightly better
| -rw-r--r-- | .github/workflows/win-build.yml | 4 | ||||
| -rw-r--r-- | win/rules.vc | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index 370f2de..a470f50 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -4,7 +4,7 @@ env: ERROR_ON_FAILURES: 1 jobs: msvc: - runs-on: windows-latest + runs-on: windows-2022 defaults: run: shell: powershell @@ -41,7 +41,7 @@ jobs: throw "nmake exit code: $lastexitcode" } gcc: - runs-on: windows-latest + runs-on: windows-2022 defaults: run: shell: msys2 {0} diff --git a/win/rules.vc b/win/rules.vc index 2f01de0..4f103d0 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -548,10 +548,15 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c !endif # NMAKEHLPC
+nmakehlp:
+ $(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console
+
# We always build nmakehlp even if it exists since we do not know
# what source it was built from.
+!if "$(MACHINE)" == "$(NATIVE_ARCH)"
!if [$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console > nul]
!endif
+!endif
################################################################
# 5. Test for compiler features
|