* runtime/Makefile.am (mcs-compileall): Set MONO_PATH. Remove

reference to #71963, since it's fixed, and it's breaking elsewhere.

svn path=/trunk/mono/; revision=39911

diff --git a/ChangeLog b/ChangeLog
index b5c653a7d8b2b446027456e06ae9e0c257f28320..007b4ef825391afb52d11b3a08f1ad98d3193bc0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-01  Raja R Harinath  <rharinath@novell.com>
+
+       * runtime/Makefile.am (mcs-compileall): Set MONO_PATH.  Remove
+       reference to #71963, since it's fixed, and it's breaking elsewhere.
+
 2005-01-31  Jonathan Pryor  <jonpryor@vt.edu>
 
        * data/config.in: Add libraries msvcrt and MonoPosixHelper for use by

diff --git a/Makefile.am b/Makefile.am
index d36ec4cee9ca3bb3c48146f7389813f06fe71fb6..0a7b391bd5f375f40a6e8254197ad51632a4c098 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,15 +34,16 @@ get-monolite-latest:
        cd $(mcslib) && { wget -O- http://www.go-mono.com/daily/monolite-latest.tar.gz | gzip -d | tar xf - ; }
        cd $(mcslib) && mv -f monolite-* monolite
 
-compiler-tests:
-       cd runtime && $(MAKE) clean-local
-       $(MAKE)
+compiler-tests: mcs-do-clean
+       $(MAKE) all
        $(MAKE) mcs-do-compiler-tests
 
 bootstrap-world: compiler-tests
        $(MAKE) install
 
 # internal targets
+mcs-do-clean:
+       cd runtime && $(MAKE) clean-local
 mcs-do-compiler-tests:
        cd runtime && $(MAKE) test_select='TEST_SUBDIRS="tests errors"' check-local
 

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index f4fc8cb48055d5e2a7f8d7f39c7cebec6355e2d9..a9008bf93233b031ee9cd7319dd2b31e90e3481d 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -90,9 +90,15 @@ mcs-do-run-test-profiles:
        rm -fr $(tmpinst) ; $$ret
 
 # Use --compile-all as a poor man's PEVerify to detect invalid IL
-# This doesn't yet work on the 2.0 profile (bug #71963)
-mcs-compileall:
-       d=`pwd`; for profile in default; do for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe; do echo $$i; $$d/mono-wrapper --compile-all $$i || exit 1; done; done
+# This doesn't yet work on the 2.0 profile
+verify_profiles = $(filter-out net_2_0, $(build_profiles))
+#verify_profiles = $(build_profiles)
+mcs-compileall: $(tmpinst)/bin/mono
+       save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && pwd`; \
+       for profile in $(verify_profiles); do \
+         MONO_PATH="$$mcs_topdir/class/lib/$$profile:$$save_MONO_PATH"; export MONO_PATH; \
+         for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe; do \
+           echo $$i; ./$(tmpinst)/bin/mono --compile-all $$i || exit 1; done; done
 
 check-local: mcs-compileall mcs-do-test-profiles
        $(MAKE) $(test_select) mcs-do-run-test-profiles
@@ -101,7 +107,7 @@ $(tmpinst)/config: ../data/config
        d=`cd ../support && pwd`; \
        sed 's,<configuration>,& <dllmap dll="MonoPosixHelper" target="'$$d/libMonoPosixHelper.la'" />,' ../data/config > $@
 
-$(tmpinst)/bin/mono: mono-wrapper
+$(tmpinst)/bin/mono: mono-wrapper $(tmpinst)/config
        sed 's,/data/config",/runtime/$(tmpinst)/config",' mono-wrapper > $@
        chmod +x $@