X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/5828a775dbd12abf0d65cd482a2f48007441c5d7..c8e62b0adda4c04b337c2dde068e6f95950fe39b:/packages/jack/jack.sh

diff --git a/packages/jack/jack.sh b/packages/jack/jack.sh
index 3048e493..c439255d 100755
--- a/packages/jack/jack.sh
+++ b/packages/jack/jack.sh
@@ -1,10 +1,18 @@
-#!/system/bin/sh
+#!/bin/sh
 
 # There needs to be a folder at $ANDROID_DATA/dalvik-cache
 export ANDROID_DATA=@TERMUX_PREFIX@/var/android/
 mkdir -p $ANDROID_DATA/dalvik-cache
 
-LD_LIBRARY_PATH=/system/lib \
+# Find the right lib folder for dalvikvm. We cannot take LD_LIBRARY_PATH
+# as is since it contains Termux-supplied libraries which may clash with
+# system ones.
+LIBFOLDER=/system/lib
+if test -d /system/lib64; then
+	LIBFOLDER=/system/lib64
+fi
+
+LD_LIBRARY_PATH=$LIBFOLDER \
 		exec dalvikvm -Xmx256m \
 		-Djava.io.tmpdir=@TERMUX_PREFIX@/tmp \
 		-cp @TERMUX_PREFIX@/share/dex/jack.jar com.android.jack.Main \