src/os/posix/launcher/launcher.script

@@ -112,25 +112,42 @@
 #     o         $JRE/lib/$ARCH
 # followed by the user's previous effective LD_LIBRARY_PATH, if
 # any.
 JRE=$JDK/jre
 JAVA_HOME=$JDK
-ARCH=@@LIBARCH@@
+export JAVA_HOME
 
+ARCH=@@LIBARCH@@
 SBP=${MYDIR}:${JRE}/lib/${ARCH}
 
-# Set up a suitable LD_LIBRARY_PATH
+
+# Set up a suitable LD_LIBRARY_PATH or DYLD_LIBRARY_PATH
+
+OS=`uname -s`
+if [ "${OS}" = "Darwin" ]
+then
+
+if [ -z "$DYLD_LIBRARY_PATH" ]
+then
+    DYLD_LIBRARY_PATH="$SBP"
+else
+    DYLD_LIBRARY_PATH="$SBP:$LD_LIBRARY_PATH"
+fi
+export DYLD_LIBRARY_PATH
+
+else
+# not 'Darwin'
 
 if [ -z "$LD_LIBRARY_PATH" ]
 then
     LD_LIBRARY_PATH="$SBP"
 else
     LD_LIBRARY_PATH="$SBP:$LD_LIBRARY_PATH"
 fi
-
 export LD_LIBRARY_PATH
-export JAVA_HOME
+
+fi
 
 JPARMS="$@ $JAVA_ARGS";
 
 # Locate the gamma development launcher
 LAUNCHER=${MYDIR}/gamma