diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-15 13:18:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-15 13:18:01 (GMT) |
| commit | b5898cc4d07090ca5d742abc116dd57baa086abc (patch) | |
| tree | bf60055a634979207608cce1e4c5260222f794e5 /win/rules.vc | |
| parent | 0fdf8385dfdc3e8f0c7a529590f0e61fcfd40525 (diff) | |
| download | tcl-b5898cc4d07090ca5d742abc116dd57baa086abc.zip tcl-b5898cc4d07090ca5d742abc116dd57baa086abc.tar.gz tcl-b5898cc4d07090ca5d742abc116dd57baa086abc.tar.bz2 | |
See [https://patch-diff.githubusercontent.com/raw/tcltk/tcl/pull/12.patch], but slightly better: If cross-compiling for ARM64, we must be on AMD64, so just use a pre-compile nmakehlp executable
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/rules.vc b/win/rules.vc index f8236f4..372d70a 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -550,9 +550,12 @@ NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c # We always build nmakehlp even if it exists since we do not know
# what source it was built from.
-!if "$(MACHINE)" == "$(NATIVE_ARCH)"
+!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"
!if [$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console > nul]
!endif
+!else
+!if [copy $(NMAKEHLPC:nmakehlp.c=x86_64-w64-mingw32-nmakehlp.exe) nmakehlp.exe >NUL]
+!endif
!endif
################################################################
@@ -1610,9 +1613,6 @@ DEFAULT_BUILD_TARGET = $(PROJECT) default-target: $(DEFAULT_BUILD_TARGET)
-nmakehlp:
- $(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console
-
!if $(MULTIPLATFORM_INSTALL)
default-pkgindex:
@echo if {[package vsatisfies [package provide Tcl] 9.0-]} { > $(OUT_DIR)\pkgIndex.tcl
|