From 6ac6046c7c53e350f09478867d7065fe43d96ae4 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Mon, 1 Jun 2020 19:43:21 +0200 Subject: [PATCH] A bit more portable scripts --- sodiumWrapper/configureLinuxArm32.sh | 3 ++- sodiumWrapper/configureLinuxArm64.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sodiumWrapper/configureLinuxArm32.sh b/sodiumWrapper/configureLinuxArm32.sh index 7dff6da..ce751f2 100755 --- a/sodiumWrapper/configureLinuxArm32.sh +++ b/sodiumWrapper/configureLinuxArm32.sh @@ -2,8 +2,9 @@ export PREFIX="$(pwd)/static-arm32" #export CC=/usr/bin/arm-none-eabi-gcc export TARGET_ARCH=armv7 +export SYSROOT="$HOME/.konan/dependencies/target-sysroot-2-raspberrypi --host=arm-none-eabi" export CFLAGS="" export LDFLAGS="--specs=nosys.specs" cd libsodium -./configure --prefix=$PREFIX --with-sysroot=/home/ionspin/.konan/dependencies/target-sysroot-2-raspberrypi --host=arm-none-eabi "$@" +./configure --prefix=$PREFIX --with-sysroot=$SYSROOT --host=arm-none-eabi "$@" diff --git a/sodiumWrapper/configureLinuxArm64.sh b/sodiumWrapper/configureLinuxArm64.sh index 6074427..df4f12e 100755 --- a/sodiumWrapper/configureLinuxArm64.sh +++ b/sodiumWrapper/configureLinuxArm64.sh @@ -3,6 +3,7 @@ export PREFIX="$(pwd)/static-arm64" export CC=/usr/bin/aarch64-linux-gnu-gcc export TARGET_ARCH=armv8-a export CFLAGS="-Os -march=${TARGET_ARCH}" +export SYSROOT="$HOME/.konan/dependencies/target-sysroot-1-linux-glibc-arm64/" cd libsodium -./configure --prefix=$PREFIX --host=aarch64-linux-gnu-gcc --with-sysroot=/home/ionspin/.konan/dependencies/target-sysroot-1-linux-glibc-arm64/ "$@" +./configure --prefix=$PREFIX --host=aarch64-linux-gnu-gcc --with-sysroot=$SYSROOT "$@"