Merge pull request #3945 from kumpera/fix-cross-domain-abort

[mono.git] / mcs / tools / macpack / LOADER

diff --git a/mcs/tools/macpack/LOADER b/mcs/tools/macpack/LOADER
index ffade6772c687b312ee32a1ed93f6c1001ed29fa..5d29a4e829dd5e73d6dd9b12e4374fc5763a0fcd 100755 (executable)
--- a/mcs/tools/macpack/LOADER
+++ b/mcs/tools/macpack/LOADER
@@ -21,7 +21,7 @@ ASSEMBLY=`echo $0 | awk '{split($0,patharr,"/"); idx=1; while(patharr[idx+1] !=
 
 # Setup the environment for MWF if needed
 if [ "$MWF_MODE" -eq "1" ]; then
-       export MONO_MWF_USE_QUARTZ_BACKEND=1
+       export MONO_MWF_USE_CARBON_BACKEND=1
        export GDIPLUS_NOX=1
 fi
 
@@ -35,6 +35,14 @@ cd "$APP_PATH/Contents/Resources"
 
 if [ "$X11_MODE" -eq "1" ]; then
        open-x11 "$APP_NAME"
+
+# rcruzs00
+# El Capitan FIX: `which` wont work (system-integrity-protection)
+# elif: Keep compatibility with previous code
+elif [ -f /usr/local/bin/mono ]; then
+        DIR=$(cd "$(dirname "$0")"; pwd)
+        /usr/local/bin/mono $DIR/../Resources/"$ASSEMBLY"
+
 else
        if [ ! -d "./bin" ]; then mkdir bin ; fi
        if [ -f "./bin/$APP_NAME" ]; then rm -f "./bin/$APP_NAME" ; fi