diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-02-17 10:33:59 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-02-17 10:33:59 +0300 |
| commit | 49ba5bd6866662086a38e5ffaf826e71a0acca1f (patch) | |
| tree | 2d67bda919c17049d7ad2f29ca60d7436520919b /runtime | |
| parent | 725e3a68d8240c821b898eed8418c2c815aba2fd (diff) | |
* 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.
svn path=/trunk/mono/; revision=40791
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
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; \ |