From 9e65dd444c29f2018225391287d343396c674c5d Mon Sep 17 00:00:00 2001 From: Niyas Sait Date: Tue, 15 Feb 2022 08:52:35 +0000 Subject: [PATCH] Avoid explicit nmakehlp build step for x86 target for cross-compilation x86 binaries can be run on all architectures so to simplify the compilation we can safely build nmakehlp.exe and avoid requiring explicit nmakehlp build step. --- win/rules.vc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/rules.vc b/win/rules.vc index b68b6b48f7ef..a48d8b76ac9c 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -553,7 +553,7 @@ nmakehlp: # 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 !endif