Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.

Commit 08ed96d

Browse files
committed
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)
1 parent 77df0e9 commit 08ed96d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

mak/WINDOWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ copy: generated\windows\copyimports.exe
3535
@~generated\windows\copyimports.exe $(COPY)
3636

3737
generated\windows\copyimports.exe: mak\copyimports.d generated\windows\host_dmd.bat
38-
generated\windows\host_dmd.bat -of=$@ mak\copyimports.d
38+
generated\windows\host_dmd.bat -of=$@ -m$(MODEL) mak\copyimports.d
3939

4040
# find a host dmd on the different CI systems
4141
# - auto-tester: 2.079 installed, but not exposed to the druntime build

win32.mak

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ OBJS_TO_DELETE= errno_c_$(MODEL).obj
4545
######################## Header file generation ##############################
4646

4747
import:
48-
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)"
48+
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
4949

5050
copydir:
51-
"$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)"
51+
"$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
5252

5353
copy:
54-
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)"
54+
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
5555

5656
################### Win32 Import Libraries ###################
5757

win64.mak

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ OBJS_TO_DELETE= errno_c_$(MODEL).obj msvc_$(MODEL).obj msvc_math_$(MODEL).obj
5454
######################## Header file generation ##############################
5555

5656
import:
57-
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)"
57+
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
5858

5959
copydir:
60-
"$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)"
60+
"$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
6161

6262
copy:
63-
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" IMPDIR="$(IMPDIR)"
63+
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
6464

6565
################### C\ASM Targets ############################
6666

0 commit comments

Comments
 (0)