YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Try justlinking the loader

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-06-10 21:37:23 +02:00 committed by Ugljesa Jovanovic
parent 7677ae16c7
commit 93a3ac5782
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linuxBuild.sh
View File

@ -2,8 +2,15 @@
#this will hopefully download all konan dependancies that we use in the build scripts #this will hopefully download all konan dependancies that we use in the build scripts
./gradlew multiplatform-crypto-api:build ./gradlew multiplatform-crypto-api:build
#now let's build linux deps #now let's build linux deps
export CLANG_BIN=$HOME/.konan/dependencies/clang-llvm-8.0.0-linux-x86-64/bin
cd sodiumWrapper cd sodiumWrapper
./makeLinuxX86-64.sh ./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 ./makeLinuxArm64.sh
#now we can do the delegated build #now we can do the delegated build
cd .. cd ..

2
sodiumWrapper/configureLinuxArm64.sh
View File

@ -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 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 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 -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" export LDFLAGS="-fuse-ld=$CLANG_BIN/ld.lld"
cd libsodium cd libsodium
./autogen.sh -s -f ./autogen.sh -s -f