Merge pull request #2190 from kframework/hotfix/library-path-el-capitan

Fix library path for El Capitan
kframework · Jul 28, 2016 · de93e7a · de93e7a
2 parents dccb840 + 53f321b
commit de93e7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/k-distribution/src/main/scripts/lib/k b/k-distribution/src/main/scripts/lib/k
@@ -15,7 +15,7 @@ else
     if [ $? -eq 0 ]; then
       $NG org.kframework.main.Main "$@"
     else
-      java -Djava.awt.headless=true $K_OPTS -ea -cp "$(dirname "$0")/java/*" org.kframework.main.Main "$@"
+      java -Djava.awt.headless=true -Djava.library.path="$THE_LIBRARY_PATH" $K_OPTS -ea -cp "$(dirname "$0")/java/*" org.kframework.main.Main "$@"
     fi
   else
     exit 1

diff --git a/k-distribution/src/main/scripts/lib/setenv b/k-distribution/src/main/scripts/lib/setenv
@@ -9,6 +9,7 @@ K_LIB_DIR="$(cd $(dirname "$0")/../lib; pwd)"
 if [ `uname` = 'Darwin' ]; then
   export PATH="$K_LIB_DIR/native/osx":$PATH
   export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:"$K_LIB_DIR/native/osx"
+  export THE_LIBRARY_PATH="$DYLD_LIBRARY_PATH"
 elif [[ `uname` == *MINGW* || `uname` == *MSYS* || `uname` == *CYGWIN* ]]; then
   export PATH="$K_LIB_DIR/native/windows":"$K_LIB_DIR/native/windows$ARCH":"$K_LIB_DIR/native/$ARCH":$PATH
 else
@@ -17,6 +18,7 @@ else
   fi
   export PATH="$K_LIB_DIR/native/linux":"$K_LIB_DIR/native/linux$ARCH":$PATH
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$K_LIB_DIR/native/linux$ARCH"
+  export THE_LIBRARY_PATH="$LD_LIBRARY_PATH"
 fi
 
 export CYGWIN=nodosfilewarning