diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | runtime/Makefile.am | 10 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 60ab006ff66..eaa092480c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-02-17 Raja R Harinath <rharinath@novell.com> + + * runtime/Makefile.am (cur_dir_cmd): New. Use cygpath to get the + current directory in non-Cygwin form. + (mcs-compileall): Use it. Use $(PATH_SEPARATOR) when defining + MONO_PATH. + 2005-02-15 Raja R Harinath <rharinath@novell.com> * scripts/Makefile.am ($(bin_SCRIPTS)): Depend on Makefile, so diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 60f3e0160b1..c84259d36ff 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -88,11 +88,17 @@ mcs-do-run-test-profiles: test-support-files ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \ rm -fr $(tmpinst); $$ret +if PLATFORM_WIN32 +cur_dir_cmd = cygpath -w -a . +else +cur_dir_cmd = pwd +endif + # Use --compile-all as a poor man's PEVerify to detect invalid IL mcs-compileall: mono-wrapper wrapper-config - save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && pwd`; ret=:; \ + save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ret=:; \ for profile in $(build_profiles); do \ - MONO_PATH="$$mcs_topdir/class/lib/$$profile:$$save_MONO_PATH"; export MONO_PATH; \ + MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PATH_SEPARATOR)$$save_MONO_PATH"; export MONO_PATH; \ for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe; do \ if ./mono-wrapper --compile-all $$i; then \ echo $$i verified OK; \ |