diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-09 09:56:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-09 09:56:37 (GMT) |
| commit | 84bbce0e297b91b5cac1c910a2d38db643a20c77 (patch) | |
| tree | 5d2330ab23fca7e014b0d2be93cab795f054c994 | |
| parent | f67b351466fbc8af63d45a45e05338d6e0b94858 (diff) | |
| download | tcl-84bbce0e297b91b5cac1c910a2d38db643a20c77.zip tcl-84bbce0e297b91b5cac1c910a2d38db643a20c77.tar.gz tcl-84bbce0e297b91b5cac1c910a2d38db643a20c77.tar.bz2 | |
Fix github actions Windows build
| -rw-r--r-- | .github/workflows/win-build.yml | 1 | ||||
| -rw-r--r-- | win/makefile.vc | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index c5b2147..7520704 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -58,7 +58,6 @@ jobs: - "--disable-shared" - "--enable-symbols" - "--enable-symbols=mem" - - "CC=g++" # Using powershell means we need to explicitly stop on failure steps: - name: Checkout diff --git a/win/makefile.vc b/win/makefile.vc index f693bf3..a5465ce 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -590,8 +590,10 @@ $(LIBTCLZIP): .PHONY @move /y "$(LIBTCLVFS)\tcl_library\manifest.txt" "$(LIBTCLVFS)\tcl_library\pkgIndex.tcl" > NUL
!if ! $(STATIC_BUILD)
# Remove the registry and dde directories as the DLLS are still external
- @$(RMDIR) "$(LIBTCLVFS)\tcl_library\registry"
- @$(RMDIR) "$(LIBTCLVFS)\tcl_library\dde"
+ @del "$(LIBTCLVFS)\tcl_library\registry\pkgIndex.tcl"
+ @rmdir "$(LIBTCLVFS)\tcl_library\registry"
+ @del "$(LIBTCLVFS)\tcl_library\dde\pkgIndex.tcl"
+ @rmdir "$(LIBTCLVFS)\tcl_library\dde"
!endif
@echo file delete -force {$@} > "$(OUT_DIR)\zipper.tcl"
@echo zipfs mkzip {$@} {$(LIBTCLVFS)} {$(LIBTCLVFS)} >> "$(OUT_DIR)\zipper.tcl"
|