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

Commit e133c26

Browse files
MoonlightSentineldlang-bot
authored andcommitted
win**.mak: Forward DMD for copyDir
The target might require the host compiler, e.g. when run as a standalone. Previously `make -f .\win32.mak copydir` failed due to `$(DMD)` expanding to the empty string: ``` "make" -f mak/WINDOWS copydir HOST_DMD="dmd" MODEL=32 IMPDIR="import" conf= -c -o- -Isrc -Iimport -Hfimport\core\sync\barrier.di src\core\sync\barrier.d Error: 'conf=' not found ```
1 parent 4b07cff commit e133c26

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import:
4848
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=32 IMPDIR="$(IMPDIR)"
4949

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

5353
copy:
5454
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=32 IMPDIR="$(IMPDIR)"

win64.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import:
6868
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
6969

7070
copydir:
71-
"$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
71+
"$(MAKE)" -f mak/WINDOWS copydir DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
7272

7373
copy:
7474
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"

0 commit comments

Comments
 (0)