X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2Fmono-wrapper.in;h=7c2822f4b996ef75426ccfdb805e0f56e6a5b8d7;hb=5217f963e7dc92aeb987505cd3d2713ee82ef098;hp=bed9aa12f8b833875ff70076176e086896a9e7c6;hpb=7015b812166d0992223b5dc4421deab637500265;p=mono.git

diff --git a/runtime/mono-wrapper.in b/runtime/mono-wrapper.in
index bed9aa12f8b..7c2822f4b99 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@'
-MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR
-exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@"
+PATH="$r/runtime/_tmpinst/bin:$PATH"
+MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
+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 "${MONO_EXECUTABLE}" --config "@mono_cfg_dir@/mono/config" "$@"