From d40175ae33dff96f8efd66f0efeefb857f12dc5d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 9 Apr 2019 11:40:28 +0200 Subject: [PATCH] wasi: enable full builds, bump bench iterations up also disable threaded linking to work around an lld bug --- dist-build/wasi.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dist-build/wasi.sh b/dist-build/wasi.sh index 7bd520d1..980d9639 100755 --- a/dist-build/wasi.sh +++ b/dist-build/wasi.sh @@ -12,7 +12,7 @@ mkdir -p $PREFIX || exit 1 export CC="clang" export CFLAGS="--target=wasm32-unknkown-wasi --sysroot=${WASI_SYSROOT} -O2" -export LDFLAGS="-s" +export LDFLAGS="-s -Wl,--no-threads" export NM="llvm-nm" export AR="llvm-ar" export RANLIB="llvm-ranlib" @@ -25,11 +25,10 @@ grep -q -F -- '-wasi' build-aux/config.sub || \ if [ "x$1" = "x--bench" ]; then export BENCHMARKS=1 - export LIBSODIUM_FULL_BUILD=1 - export CPPFLAGS="-DBENCHMARKS -DITERATIONS=25" + export CPPFLAGS="-DBENCHMARKS -DITERATIONS=100" fi -if [ -z "$LIBSODIUM_FULL_BUILD" ]; then +if [ -n "$LIBSODIUM_MINIMAL_BUILD" ]; then export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" else export LIBSODIUM_ENABLE_MINIMAL_FLAG="" @@ -37,7 +36,8 @@ fi ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ --prefix="$PREFIX" --with-sysroot="$WASI_SYSROOT" \ - --host=wasm32-unknown-wasi --disable-ssp --disable-shared || exit 1 + --host=wasm32-unknown-wasi \ + --disable-ssp --disable-shared || exit 1 NPROCESSORS=$(getconf NPROCESSORS_ONLN 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null) PROCESSORS=${NPROCESSORS:-3}