diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2009-05-06 22:49:05 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2009-05-06 22:49:05 +0400 |
| commit | 4952caf2b3b19f8d9ba5834cedeb700eecea9615 (patch) | |
| tree | 5a42909cad359b3772a809f3038174fb5f822bd0 /runtime | |
| parent | ff6b61194bf1e9ff6374cf8953d6f3c21a4155d6 (diff) | |
Break some circular dependencies between mono, mcs and moon
* Makefile.am (compiler-tests): Rewrite to re-build the moon
assemblies after mcs/ is built.
* runtime/Makefile.am (build_profiles) [INSTALL_2_1]: Build only
the net_2_1_raw profile.
(test_profiles): New. Mention net_2_1 profile.
(moon-do-build): New.
svn path=/trunk/mono/; revision=133678
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 7c9cf7bc9c7..b30be6388fc 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -21,12 +21,15 @@ SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config if INSTALL_2_0 if INSTALL_2_1 -build_profiles = net_1_1 net_2_0 net_3_5 net_2_1 +build_profiles = net_1_1 net_2_0 net_3_5 net_2_1_raw +test_profiles = net_1_1 net_2_0 net_3_5 net_2_1 else build_profiles = net_1_1 net_2_0 net_3_5 +test_profiles = $(build_profiles) endif else build_profiles = net_1_1 +test_profiles = $(build_profiles) endif if BUILD_MCS @@ -68,11 +71,19 @@ else test_select = ONLY_CENTUM_TESTS=yes endif +if INSTALL_2_1 +moon-do-build: test-support-files + cd $(top_builddir)/../moon/class && $(MAKE) all +else +moon-do-build: + @: +endif + mcs-do-test-profiles: - cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' test-profiles + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles mcs-do-run-test-profiles: test-support-files - cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' run-test-profiles + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-test-profiles if PLATFORM_WIN32 if CROSS_COMPILING @@ -92,7 +103,7 @@ endif # Skip net 2.1 assemblies for now because of visibility problems mcs-compileall: mono-wrapper etc/mono/config save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \ - for profile in $(build_profiles); do \ + for profile in $(test_profiles); do \ if [ "net_2_1" = "$$profile" ]; then \ break; \ fi; \ |