[build] Bump required bootraping mono version and download it automatically

diff --git a/mcs/build/common/basic-profile-check.cs b/mcs/build/common/basic-profile-check.cs
index 631b764bf9dd24608afc325f7d47d345ea34edee..591843dd20eda826eab268f402544cdc2950c2ce 100644 (file)
--- a/mcs/build/common/basic-profile-check.cs
+++ b/mcs/build/common/basic-profile-check.cs
@@ -40,7 +40,7 @@ class X {
                if (!Version.TryParse (field.GetValue (null) as string, out version))
                        return 4;
 
-               if (version < new Version (4, 0))
+               if (version < new Version (4, 8))
                        return 5;
 
                return 0;

diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make
index 9170e7c08975f506fce9b08e089871152b90d03c..d1e21c29247b1467c70f4d50cb50fc48862be989 100644 (file)
--- a/mcs/build/profiles/basic.make
+++ b/mcs/build/profiles/basic.make
@@ -67,17 +67,22 @@ do-profile-check: $(depsdir)/.stamp
        if [ -z '$(MAKE_Q)' ] && [ -n '$(PROFILE_RUNTIME)' ]; then $(PROFILE_RUNTIME) --version; fi; \
        $(MAKE) $(MAKE_Q) $(PROFILE_OUT) || ok=false; \
        if $$ok; then rm -f $(PROFILE_EXE) $(PROFILE_OUT); else \
+           if test ! -s $(MONOLITE_MSCORLIB); then \
+                       $(MAKE) $(MAKE_Q) do-get-monolite ; \
+               fi; \
            if test -f $(MONOLITE_MSCORLIB); then \
                $(MAKE) $(MAKE_Q) do-profile-check-monolite ; \
            else \
                echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2; \
-                echo "*** You need Mono version 4.0 or better installed to build MCS" 1>&2 ; \
+                echo "*** You need Mono version 4.8 or better installed to build MCS" 1>&2 ; \
                 echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
                exit 1; fi; fi
 
 
 ifdef use_monolite
 
+do-get-monolite:
+
 do-profile-check-monolite:
        @echo "*** The contents of your 'monolite' directory may be out-of-date" 1>&2
        @echo "*** You may want to try 'make get-monolite-latest'" 1>&2
@@ -86,6 +91,10 @@ do-profile-check-monolite:
 
 else
 
+do-get-monolite:
+       @echo "*** Downloading bootstrap required 'monolite'" 1>&2
+       $(MAKE) $(MAKE_Q) -C $(topdir)/../ get-monolite-latest
+
 do-profile-check-monolite: $(depsdir)/.stamp
        @echo "*** The runtime '$(PROFILE_RUNTIME)' doesn't appear to be usable." 1>&2
        @echo "*** Trying the 'monolite' directory." 1>&2