diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-09-16 14:13:20 +0400 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-09-16 14:13:20 +0400 |
| commit | 8588ef1c85cdab072e9ddafa77f6f1408ec3682d (patch) | |
| tree | 785a59107d26df27cbc187a14e1667d78bcb0319 /runtime | |
| parent | 8e1bf653cf076ed80af74c9d396ebe9e82d6b6b2 (diff) | |
* runtime/Makefile.am (all-local, install-exec, uninstall)
(mcs-do-test-profiles, mcs-do-run-test-profiles, mcs-compileall):
Don't call semdel-wrapper.
* mono/mini/Makefile.am (check-local): Don't invoke semdel-wrapper.
* mono/tests/Makefile.am (check-local): Don't invoke semdel-wrapper.
Remove calls to 'semdel-wrapper' except where necessary. Having them
makes failures on Win32 builds confusing, and hinders development by
making parallel makes in different profiles race.
svn path=/trunk/mono/; revision=50138
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index c807bf32b01..457c7f9fda9 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -19,10 +19,7 @@ SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config # The write check is to foil 'make distcheck' all-local: $(SUPPORT_FILES) if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && \ - $(MAKE) PROFILES='$(build_profiles)' all-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' all-profiles if INSTALL_2_0 build_profiles = default net_2_0 @@ -35,10 +32,7 @@ install: install-exec install-data # override automake install-exec: $(SUPPORT_FILES) - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && \ - $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles # override automake install-data: @@ -46,14 +40,11 @@ install-data: # override automake uninstall: - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && \ - $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles ## semdel-wrapper will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-) clean-local: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles -./semdel-wrapper -rm -fr $(etctmp) $(tmpinst) .wapi @@ -71,14 +62,11 @@ test_select = ONLY_CENTUM_TESTS=yes endif mcs-do-test-profiles: - d=`pwd`; ok=:; \ - ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles ) || ok=false; \ - ./semdel-wrapper || :; $$ok + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles mcs-do-run-test-profiles: test-support-files - d=`pwd`; ok=:; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \ - ( cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles ) || ok=false; \ - ./semdel-wrapper || :; rm -fr $(tmpinst); $$ok + d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \ + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles if PLATFORM_WIN32 cur_dir_cmd = cygpath -w -a . @@ -99,7 +87,7 @@ mcs-compileall: mono-wrapper wrapper-config else \ echo $$i verification failed; ok=false; \ fi; done; done; \ - ./semdel-wrapper || :; $$ok + $$ok check-local: mcs-compileall mcs-do-test-profiles $(MAKE) $(test_select) mcs-do-run-test-profiles |