mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 05:00:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

make: Put windows build files in the toplevel generated directory

Browse source
This commit is contained in:
Iain Buclaw 2022-10-12 15:19:00 +02:00 • committed by The Dlang Bot
parent 2893fabc9d
commit 8f00b6dac7
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
druntime/mak/WINDOWS
View file

@ -6,11 +6,11 @@ import: copy
copydir: $(IMPDIR)
copy: generated\windows\copyimports.exe
@~generated\windows\copyimports.exe $(COPY)
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=$@ -m$(MODEL) mak\copyimports.d
..\generated\windows\copyimports.exe: mak\copyimports.d ..\generated\windows\host_dmd.bat
..\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
@ -19,9 +19,9 @@ generated\windows\copyimports.exe: mak\copyimports.d generated\windows\host_dmd.
# - azure-vs: $(DMD_DIR)\dmd2\Windows\bin\dmd.exe
ATCLIENT_DMD = ../../release-build/dmd-2.079.0/windows/bin/dmd.exe
generated\windows\host_dmd.bat:
+if not exist generated md generated
+if not exist generated\windows md generated\windows
..\generated\windows\host_dmd.bat:
+if not exist ..\generated md ..\generated
+if not exist ..\generated\windows md ..\generated\windows
-+if exist "$(ATCLIENT_DMD)" (echo @"$(ATCLIENT_DMD)" %* >$@)
-+if not "$(DMD_DIR)" == "" ("$(DMD_DIR)\dmd2\Windows\bin\dmd.exe" --version >nul 2>&1 && echo @"$(DMD_DIR)\dmd2\Windows\bin\dmd.exe" %* >$@)
-+if not "$(HOST_DC)" == "" ("$(HOST_DC)" --version >nul 2>&1 && echo @"$(HOST_DC)" %* >$@)