Add more logging

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

diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make
index 690b222894e62c1f0b99f5e4a0f46bb7f6f00090..ca7534fe070a3560a97e727cd5865e820e242f97 100644 (file)
--- a/mcs/build/profiles/basic.make
+++ b/mcs/build/profiles/basic.make
@@ -3,24 +3,32 @@
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 with_mono_path_monolite = MONO_PATH="$(topdir)/class/lib/monolite$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 
-monolite_flag := $(topdir)/build/deps/use-monolite
+monolite_flag := $(depsdir)/use-monolite
 use_monolite := $(wildcard $(monolite_flag))
 
 ifdef use_monolite
 PROFILE_RUNTIME = $(with_mono_path_monolite) $(RUNTIME)
-BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/monolite/mcs.exe
+BOOTSTRAP_MCS = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/monolite/gmcs.exe
 else
 PROFILE_RUNTIME = $(EXTERNAL_RUNTIME)
 BOOTSTRAP_MCS = $(EXTERNAL_MCS)
 endif
 
-MCS = $(with_mono_path) $(INTERNAL_MCS)
+MCS = $(with_mono_path) $(INTERNAL_GMCS)
 
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1 -d:BOOTSTRAP_WITH_OLDLIB
+PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:BOOTSTRAP_BASIC
 NO_SIGN_ASSEMBLY = yes
 NO_TEST = yes
 NO_INSTALL = yes
-FRAMEWORK_VERSION = 1.0
+FRAMEWORK_VERSION = 2.0
+
+# Verbose basic only
+# V = 1
+
+#
+# Copy from rules.make because I don't know how to unset MCS_FLAGS
+#
+USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS)
 
 .PHONY: profile-check do-profile-check
 profile-check:
@@ -33,26 +41,25 @@ clean-local: clean-profile
 endif
 
 clean-profile:
-       -rm -f $(PROFILE_CS) $(PROFILE_EXE) $(PROFILE_OUT) $(monolite_flag)
+       -rm -f $(PROFILE_EXE) $(PROFILE_OUT) $(monolite_flag)
 
 post-profile-cleanup:
        @rm -f $(monolite_flag)
 
-PROFILE_CS  = $(topdir)/build/deps/basic-profile-check.cs
-PROFILE_EXE = $(PROFILE_CS:.cs=.exe)
-PROFILE_OUT = $(PROFILE_CS:.cs=.out)
+PROFILE_EXE = $(depsdir)/basic-profile-check.exe
+PROFILE_OUT = $(PROFILE_EXE:.exe=.out)
 
-do-profile-check:
+do-profile-check: $(depsdir)/.stamp
        @ok=:; \
        rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
        $(MAKE) -s $(PROFILE_OUT) > /dev/null || ok=false; \
        rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
        if $$ok; then :; else \
-           if test -f $(topdir)/class/lib/monolite/mcs.exe; then \
+           if test -f $(topdir)/class/lib/monolite/gmcs.exe; then \
                $(MAKE) -s do-profile-check-monolite ; \
            else \
                echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
-                echo "*** You need a C# compiler installed to build MCS (make sure mcs works from the command line)" 1>&2 ; \
+                echo "*** You need a C# compiler version 2.0 or better installed to build MCS" 1>&2 ; \
                 echo "*** Read INSTALL.txt for information on how to bootstrap a Mono installation." 1>&2 ; \
                exit 1; fi; fi
 
@@ -67,7 +74,7 @@ do-profile-check-monolite:
 
 else
 
-do-profile-check-monolite:
+do-profile-check-monolite: $(depsdir)/.stamp
        echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2
        echo "*** Trying the 'monolite' directory." 1>&2
        echo dummy > $(monolite_flag)
@@ -75,11 +82,10 @@ do-profile-check-monolite:
 
 endif
 
-$(PROFILE_CS): $(topdir)/build/profiles/basic.make
-       echo 'class X { static int Main () { return 0; } }' > $@
-
-$(PROFILE_EXE): $(PROFILE_CS)
-       $(BOOTSTRAP_MCS) /out:$@ $<
+$(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs
+       $(BOOTSTRAP_MCS) /warn:0 /out:$@ $<
+       echo -n "Bootstrap compiler: " 1>&2
+       $(BOOTSTRAP_MCS) --version 1>&2
 
 $(PROFILE_OUT): $(PROFILE_EXE)
        $(PROFILE_RUNTIME) $< > $@ 2>&1