Remove x86_64-w64-mingw32-nmakehlp.exe. In its place, use the NMAKEHLP_NATIVE variable to find an nmakehlp.exe during cross compilation.

Author: pabtor

win/find_nmakehlp.tcl

@@ -0,0 +1,24 @@
+if {$argc != 1} {
+    puts stderr "Usage: [info script] <path-to-tclsh>"
+    exit 1
+}
+
+set tclsh_path [lindex $argv 0]
+
+# Normalize path separators to forward slashes for manipulation
+set normalized [file normalize $tclsh_path]
+
+# Get the directory containing the executable (removes bin\tclsh91.exe)
+set bin_dir [file dirname $normalized]
+set install_dir [file dirname $bin_dir]
+
+# Build the target path: <install_dir>/lib/nmake/nmakehlp.exe
+set nmakehlp_path [file nativename [file join $install_dir lib nmake nmakehlp.exe]]
+
+if {[file exists $nmakehlp_path]} {
+    puts "NMAKEHLP_NATIVE=$nmakehlp_path"
+    exit 0
+} else {
+    puts stderr "Error: nmakehlp.exe not found at: $nmakehlp_path"
+    exit 1
+}

win/rules-ext.vc

@@ -31,19 +31,31 @@ macro to the name of the project makefile.
 # We extract version numbers using the nmakehlp program. For now use
 # the local copy of nmakehlp. Once we locate Tcl, we will use that
 # one if it is newer.
-!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"
 !if [$(CC) -nologo -DNDEBUG "nmakehlp.c" -link -subsystem:console > nul]
 !endif
-!else
-!if [copy x86_64-w64-mingw32-nmakehlp.exe nmakehlp.exe >NUL]
-!endif
-!endif
 
 # First locate the Tcl directory that we are working with.
 !if "$(TCLDIR)" != ""
 
 _RULESDIR = $(TCLDIR:/=\)
 
+# We need a nmakehlp that will run on the host machine as part of the build.
+# if TCLSH_NATIVE is set for cross compilation, we'll try to find an associated 
+# nmakehlp.exe that runs on the build architecture.
+!ifdef TCLSH_NATIVE
+!ifndef NMAKEHLP_NATIVE
+!if [$(TCLSH_NATIVE) $(TCLDIR)\win\find_nmakehlp.tcl $(TCLSH_NATIVE) > find_nmakehlp.out]
+!error TCLSH_NATIVE is set, but unable to find associated nmakehlp.exe nearby.
+!else
+!include find_nmakehlp.out
+!endif
+!endif
+!endif
+
+!ifndef NMAKEHLP_NATIVE
+NMAKEHLP_NATIVE=nmakehlp
+!endif
+
 !else
 
 # If an installation path is specified, that is also the Tcl directory.
@@ -53,7 +65,7 @@ _RULESDIR=$(INSTALLDIR:/=\)
 !else
 # Locate Tcl sources
 !if [echo _RULESDIR = \> nmakehlp.out] \
-   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]
+   || [$(NMAKEHLP_NATIVE) -L generic\tcl.h >> nmakehlp.out]
 _RULESDIR = ..\..\tcl
 !else
 !include nmakehlp.out
@@ -82,17 +94,17 @@ _RULESDIR = .
 !if exist("rules.vc") # The extension has its own copy
 
 !if [echo TCL_RULES_MAJOR = \> versions.vc] \
-   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]
+   && [$(NMAKEHLP_NATIVE) -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]
 !endif
 !if [echo TCL_RULES_MINOR = \>> versions.vc] \
-   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MINOR >> versions.vc]
+   && [$(NMAKEHLP_NATIVE) -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MINOR >> versions.vc]
 !endif
 
 !if [echo OUR_RULES_MAJOR = \>> versions.vc] \
-   && [nmakehlp -V "rules.vc" RULES_VERSION_MAJOR >> versions.vc]
+   && [$(NMAKEHLP_NATIVE) -V "rules.vc" RULES_VERSION_MAJOR >> versions.vc]
 !endif
 !if [echo OUR_RULES_MINOR = \>> versions.vc] \
-   && [nmakehlp -V "rules.vc" RULES_VERSION_MINOR >> versions.vc]
+   && [$(NMAKEHLP_NATIVE) -V "rules.vc" RULES_VERSION_MINOR >> versions.vc]
 !endif
 !include versions.vc
 # We have a newer version of the support files, use them
@@ -120,4 +132,4 @@ NMAKEHLPC = $(_RULESDIR)\nmakehlp.c
 !error *** Could not locate rules.vc in $(_RULESDIR)
 !endif
 
-!endif # _RULES_EXT_VC
+!endif # _RULES_EXT_VC