diff --git a/linuxBuild.sh b/linuxBuild.sh index 3a71379..c1c7820 100644 --- a/linuxBuild.sh +++ b/linuxBuild.sh @@ -2,8 +2,15 @@ #this will hopefully download all konan dependancies that we use in the build scripts ./gradlew multiplatform-crypto-api:build #now let's build linux deps +export CLANG_BIN=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin cd sodiumWrapper ./makeLinuxX86-64.sh +#Workaround for travis using wrong ld +if [ "$TRAVIS" = "true" ] +then + sudo mv /usr/bin/ld /usr/bin/ld.bck + sudo ln -s $CLANG_BIN/ld.lld /usr/bin/ld +fi ./makeLinuxArm64.sh #now we can do the delegated build cd .. diff --git a/sodiumWrapper/configureLinuxArm64.sh b/sodiumWrapper/configureLinuxArm64.sh index edcf51d..7cf24f3 100755 --- a/sodiumWrapper/configureLinuxArm64.sh +++ b/sodiumWrapper/configureLinuxArm64.sh @@ -5,7 +5,7 @@ export CC=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin/clang export SYSROOT=$HOME/.konan/dependencies/target-sysroot-1-linux-glibc-arm64 export TOOLCHAIN=$HOME/.konan/dependencies/target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu #export CFLAGS="-O3 -target aarch64-unknown-linux-gnu --sysroot $SYSROOT -gcc-toolchain $TOOLCHAIN -fuse-ld=$CLANG_BIN/ld.lld -B$CLANG_BIN" -export CFLAGS="-O3 -target aarch64-unknown-linux-gnu --sysroot $SYSROOT -fuse-ld=$CLANG_BIN/ld.lld -B$CLANG_BIN" +export CFLAGS="-O3 -target aarch64-unknown-linux-gnu --sysroot $SYSROOT -fuse-ld=$CLANG_BIN/ld.lld" export LDFLAGS="-fuse-ld=$CLANG_BIN/ld.lld" cd libsodium ./autogen.sh -s -f