X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2Fmono-wrapper.in;h=18c8cb5e47b959b19d0c26b29a9f2bc42ae35cce;hb=c018aea7e9161343160b78f46d3afba81ce54bd0;hp=bed9aa12f8b833875ff70076176e086896a9e7c6;hpb=9d61782c6e2392d7ceec2006b35be582598a70ae;p=mono.git

diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in
index bed9aa12f8b..18c8cb5e47b 100644
--- a/runtime/mono-wrapper.in
+++ b/runtime/mono-wrapper.in
@@ -1,6 +1,16 @@
 #! /bin/sh
 r='@mono_build_root@'
 MONO_CFG_DIR='@mono_cfg_dir@'
+PATH="$r/runtime/_tmpinst/bin:$PATH"
 MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR
+export MONO_CFG_DIR MONO_SHARED_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" "$@"