From 95aa910a4d5b50ce9188572cae5a88d84716c318 Mon Sep 17 00:00:00 2001 From: FriwiDev Date: Thu, 18 Nov 2021 06:33:00 +0100 Subject: [PATCH] Fix compile error on linux/arm/v6 later --- scripts/run_linux.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/scripts/run_linux.sh b/scripts/run_linux.sh index 735fcd0..399ba12 100644 --- a/scripts/run_linux.sh +++ b/scripts/run_linux.sh @@ -4,16 +4,10 @@ set -e # Determine architecture echo "Building for architecture $TARGETARCH" -# Install adoptium on arm/v6, as default openjdk will fail to compile java classes -# This isn't ideal but better than not being able to compile on/for arm/v6 +# Point to jdk installation on arm/v6 if [ ${TARGETARCH} == 'arm/v6' ]; then - curl -L -o jdk.tar.gz https://cdn.azul.com/zulu-embedded/bin/zulu11.41.75-ca-jdk11.0.8-linux_aarch32hf.tar.gz - tar xzf jdk.tar.gz - export JAVA_HOME=$PWD/zulu11.41.75-ca-jdk11.0.8-linux_aarch32hf - export PATH=$PWD/zulu11.41.75-ca-jdk11.0.8-linux_aarch32hf/bin:$PATH - apt-get -q install -y libc6-armhf-cross - ln -sf /usr/arm-linux-gnueabihf/lib/ld-linux-armhf.so.3 /lib/ld-linux-armhf.so.3 - #export LD_LIBRARY_PATH=/lib/arm-linux-gnueabihf + export PATH=/usr/lib/jvm/openjdk-11-jdk/bin:$PATH + export JAVA_HOME=/usr/lib/jvm/openjdk-11-jdk fi # Print some debug info