From 08ed96ddaea81beda8350397058f95c1a22e484a Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Tue, 28 Apr 2020 21:48:17 +0200 Subject: [PATCH] forward and use -m$(MODEL) when building tools with host dmd - fixup for #3026 - fixes 32-bit release builds with ldc (vcvars x86, but x64 default target of ldc) --- mak/WINDOWS | 2 +- win32.mak | 6 +++--- win64.mak | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mak/WINDOWS b/mak/WINDOWS index 1a9b6c6750..b3d7b26cea 100644 --- a/mak/WINDOWS +++ b/mak/WINDOWS @@ -35,7 +35,7 @@ copy: generated\windows\copyimports.exe @~generated\windows\copyimports.exe $(COPY) generated\windows\copyimports.exe: mak\copyimports.d generated\windows\host_dmd.bat - generated\windows\host_dmd.bat -of=$@ mak\copyimports.d + generated\windows\host_dmd.bat -of=$@ -m$(MODEL) mak\copyimports.d # find a host dmd on the different CI systems # - auto-tester: 2.079 installed, but not exposed to the druntime build diff --git a/win32.mak b/win32.mak index efab1c44ac..a73a0fa224 100644 --- a/win32.mak +++ b/win32.mak @@ -45,13 +45,13 @@ OBJS_TO_DELETE= errno_c_$(MODEL).obj ######################## Header file generation ############################## import: - "$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)" + "$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)" copydir: - "$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)" + "$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)" copy: - "$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)" + "$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)" ################### Win32 Import Libraries ################### diff --git a/win64.mak b/win64.mak index 752b899f2b..090037052b 100644 --- a/win64.mak +++ b/win64.mak @@ -54,13 +54,13 @@ OBJS_TO_DELETE= errno_c_$(MODEL).obj msvc_$(MODEL).obj msvc_math_$(MODEL).obj ######################## Header file generation ############################## import: - "$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)" + "$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)" copydir: - "$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)" + "$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)" copy: - "$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)" + "$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)" ################### C\ASM Targets ############################