From d4ec811631d3737f56cd5d09e389dadd73502ea4 Mon Sep 17 00:00:00 2001 From: Jonathan Marler Date: Tue, 19 Dec 2017 03:48:47 -0700 Subject: [PATCH] in win32.mak, default HOST_DC to dmd --- src/win32.mak | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/win32.mak b/src/win32.mak index 5eeccb8b4ebd..1c71c642c3ec 100644 --- a/src/win32.mak +++ b/src/win32.mak @@ -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 ############################### @@ -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