Merge pull request #4219 from marek-safar/corert-bump

[mono.git] / mcs / build / profiles / basic.make

diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make
index 6095f4d4a6f49d29776d13a4cf96df8629f975d3..2b822234f612322bb2a8c03290bcf2dcb120d2dd 100644 (file)
--- a/mcs/build/profiles/basic.make
+++ b/mcs/build/profiles/basic.make
@@ -7,22 +7,28 @@ use_monolite := $(wildcard $(monolite_flag))
 
 MONOLITE_MSCORLIB = $(topdir)/class/lib/monolite/mscorlib.dll
 
-# Bootstrap compiler does not have to be same as production compiler
-INTERNAL_GMCS = $(CSC_LOCATION)
-
 ifdef use_monolite
+ifdef MCS_MODE
+       CSC_LOCATION = $(topdir)/class/lib/monolite/mcs.exe
+endif
+
 PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
+BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
+
 else
 PROFILE_RUNTIME = $(EXTERNAL_RUNTIME)
+ifdef MCS_MODE
+       BOOTSTRAP_MCS = mcs
+else
+       BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(CSC_LOCATION)
+endif
 endif
 
-INTERNAL_CSC = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(INTERNAL_GMCS)
-BOOTSTRAP_MCS = $(INTERNAL_CSC)
 MCS = $(BOOTSTRAP_MCS)
 
 DEFAULT_REFERENCES = -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll
 
-PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
+PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_BASIC -nowarn:1699 -nostdlib $(DEFAULT_REFERENCES)
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 NO_INSTALL = yes
@@ -92,7 +98,7 @@ else
 
 do-get-monolite:
        @echo "*** Downloading bootstrap required 'monolite'" 1>&2
-       $(MAKE) $(MAKE_Q) -C $(topdir)/../ get-monolite-latest
+       $(MAKE) $(MAKE_Q) -C $(mono_build_root) get-monolite-latest
 
 do-profile-check-monolite: $(depsdir)/.stamp
        @echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2
@@ -104,7 +110,7 @@ endif
 
 $(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs
        $(MAKE) $(MAKE_Q) -C $(topdir)/packages
-       $(INTERNAL_CSC) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
+       $(BOOTSTRAP_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
 
 $(PROFILE_OUT): $(PROFILE_EXE)
        $(PROFILE_RUNTIME) $< > $@ 2>&1