Merge pull request #1857 from slluis/fix-assembly-resolver

[mono.git] / runtime / mono-wrapper.in

diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in
index bed9aa12f8b833875ff70076176e086896a9e7c6..0ec4811fb5d03657a1bd71f85d6dad373891235f 100644 (file)
--- a/runtime/mono-wrapper.in
+++ b/runtime/mono-wrapper.in
@@ -1,6 +1,15 @@
 #! /bin/sh
 r='@mono_build_root@'
 MONO_CFG_DIR='@mono_cfg_dir@'
-MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR
+PATH="$r/runtime/_tmpinst/bin:$PATH"
+export MONO_CFG_DIR PATH
+if [ -n "@nacl_self_host@" ]; then
+  case "$@" in
+    # gacutil.exe and mdoc.exe require filesystem functionality not
+    # exposed in NaCl.
+    # mcs.exe was added to the list recently because mcs under NaCl
+    # no longer produces equivalent output. TODO: investigate
+    */mcs.exe* | */gacutil.exe* | */mdoc.exe* ) exec /usr/local/bin/mono "$@";;
+  esac
+fi
 exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@"