Skip to content

(Option 2) in win32.mak, default HOST_DC to dmd #7468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marler8997 wants to merge 1 commit into from
Closed

(Option 2) in win32.mak, default HOST_DC to dmd #7468

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ MFLAGS=-I$C;$(TK) $(OPT) -DMARS -cpp $(DEBUG) -e -wx -DTARGET_WINDOS=1 -DDM_TARG
DFLAGS=$(DOPT) $(DMODEL) $(DDEBUG) -wi -version=MARS

# Recursive make
DMDMAKE=$(MAKE) -fwin32.mak C=$C TK=$(TK) ROOT=$(ROOT) MAKE="$(MAKE)" HOST_DC="$(HOST_DC)" MODEL=$(MODEL) CC="$(CC)" LIB="$(LIB)" OBJ_MSVC="$(OBJ_MSVC)"
DMDMAKE1=$(MAKE) -fwin32.mak C=$C TK=$(TK) ROOT=$(ROOT) MAKE="$(MAKE)" MODEL=$(MODEL) CC="$(CC)" LIB="$(LIB)" OBJ_MSVC="$(OBJ_MSVC)"
DMDMAKE=$(DMDMAKE1) HOST_DC="$(HOST_DC)"

############################### Rule Variables ###############################

Expand Down Expand Up @@ -273,13 +274,19 @@ MAKEFILES=win32.mak posix.mak osmodel.mak

############################## Release Targets ###############################

defaulttarget: $G debdmd
defaulttarget:
@if "$(HOST_DC)"=="" (echo HOST_DC=dmd & $(DMDMAKE1) HOST_DC=dmd defaulttarget_hostdc) else ($(DMDMAKE) defaulttarget_hostdc)

defaulttarget_hostdc: $G debdmd

auto-tester-build: $G dmd checkwhitespace $(DMDFRONTENDEXE)

dmd: $G reldmd

release:
@if "$(HOST_DC)"=="" (echo HOST_DC=dmd & $(DMDMAKE1) HOST_DC=dmd release_hostdc) else ($(DMDMAKE) release_hostdc)

release_hostdc:
$(DMDMAKE) clean
$(DEL) $(TARGETEXE)
$(DMDMAKE) reldmd
Expand Down