diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2010-01-12 05:12:52 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2010-01-12 05:12:52 +0300 |
| commit | 6ddb87775a8a64741a504d3f5784242072b53df1 (patch) | |
| tree | 671cc5dd683ed6c3054655d284c12b488fe0047e /mcs/build | |
| parent | 7812e1a803be39618f5f00dea145efe563665d9f (diff) | |
2010-01-12 Zoltan Varga <vargaz@gmail.com>
* profiles/basic.make: Document that mono 2.6 can't be compiled with mono SVN HEAD.
svn path=/branches/mono-2-6/mcs/; revision=149365
Diffstat (limited to 'mcs/build')
| -rw-r--r-- | mcs/build/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/build/profiles/basic.make | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index 944f37b308b..5d3f1e45d77 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,3 +1,7 @@ +2010-01-12 Zoltan Varga <vargaz@gmail.com> + + * profiles/basic.make: Document that mono 2.6 can't be compiled with mono SVN HEAD. + 2009-11-17 Marek Habersack <mhabersack@novell.com> * tests.make (TEST_RUNTIME_WRAPPERS_PATH): added - used to set up diff --git a/mcs/build/profiles/basic.make b/mcs/build/profiles/basic.make index 19a36342725..e17c0e7b688 100644 --- a/mcs/build/profiles/basic.make +++ b/mcs/build/profiles/basic.make @@ -47,17 +47,20 @@ PROFILE_CS = $(depsdir)/basic-profile-check.cs PROFILE_EXE = $(PROFILE_CS:.cs=.exe) PROFILE_OUT = $(PROFILE_CS:.cs=.out) +MAKE_Q=$(if $(V),,-s) + do-profile-check: @ok=:; \ rm -f $(PROFILE_EXE) $(PROFILE_OUT); \ - $(MAKE) -s $(PROFILE_OUT) > /dev/null || ok=false; \ + $(MAKE) $(MAKE_Q) $(PROFILE_OUT) || ok=false; \ rm -f $(PROFILE_EXE) $(PROFILE_OUT); \ if $$ok; then :; else \ if test -f $(topdir)/class/lib/monolite/mcs.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# 1.0 compiler installed to build MCS (make sure mcs works from the command line)" 1>&2 ; \ + echo "*** mcs/gmcs from mono > 2.6 will not work, since they target NET 2.0." 1>&2 ; \ echo "*** Read INSTALL.txt for information on how to bootstrap a Mono installation." 1>&2 ; \ exit 1; fi; fi |