From c7f0f0520977635a1c0ed89bb5ec16bd060831ca Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Tue, 6 Mar 2018 21:20:17 +0100 Subject: [PATCH] I turned it around. --- dist-build/android-build.sh | 4 ++-- dist-build/ios.sh | 4 ++-- dist-build/nativeclient-pnacl.sh | 5 ++--- dist-build/nativeclient-x86.sh | 5 +++-- dist-build/nativeclient-x86_64.sh | 4 ++-- dist-build/osx.sh | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh index 502dc819..d701c631 100755 --- a/dist-build/android-build.sh +++ b/dist-build/android-build.sh @@ -46,9 +46,9 @@ env - PATH="$PATH" \ --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1 if [ -z "$LIBSODIUM_FULL_BUILD" ]; then - export LIBSODIUM_ENABLE_MINIMAL_FLAG="" -else export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" +else + export LIBSODIUM_ENABLE_MINIMAL_FLAG="" fi ./configure \ diff --git a/dist-build/ios.sh b/dist-build/ios.sh index ec4b0315..bf1b7f3d 100755 --- a/dist-build/ios.sh +++ b/dist-build/ios.sh @@ -34,9 +34,9 @@ export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SI make distclean > /dev/null if [ -z "$LIBSODIUM_FULL_BUILD" ]; then - export LIBSODIUM_ENABLE_MINIMAL_FLAG="" -else export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" +else + export LIBSODIUM_ENABLE_MINIMAL_FLAG="" fi ./configure --host=i686-apple-darwin10 \ diff --git a/dist-build/nativeclient-pnacl.sh b/dist-build/nativeclient-pnacl.sh index 6620cfec..07e3cce5 100755 --- a/dist-build/nativeclient-pnacl.sh +++ b/dist-build/nativeclient-pnacl.sh @@ -20,12 +20,11 @@ mkdir -p $PREFIX || exit 1 make distclean > /dev/null if [ -z "$LIBSODIUM_FULL_BUILD" ]; then - export LIBSODIUM_ENABLE_MINIMAL_FLAG="" -else export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" +else + export LIBSODIUM_ENABLE_MINIMAL_FLAG="" fi - ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ --host=nacl \ --disable-ssp --without-pthreads \ diff --git a/dist-build/nativeclient-x86.sh b/dist-build/nativeclient-x86.sh index 3c5fefc5..5516d311 100755 --- a/dist-build/nativeclient-x86.sh +++ b/dist-build/nativeclient-x86.sh @@ -12,11 +12,12 @@ mkdir -p $PREFIX || exit 1 make distclean > /dev/null if [ -z "$LIBSODIUM_FULL_BUILD" ]; then - export LIBSODIUM_ENABLE_MINIMAL_FLAG="" -else export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" +else + export LIBSODIUM_ENABLE_MINIMAL_FLAG="" fi + ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ --host=i686-nacl \ --disable-ssp --without-pthreads \ diff --git a/dist-build/nativeclient-x86_64.sh b/dist-build/nativeclient-x86_64.sh index b3974310..8a90c099 100755 --- a/dist-build/nativeclient-x86_64.sh +++ b/dist-build/nativeclient-x86_64.sh @@ -12,9 +12,9 @@ mkdir -p $PREFIX || exit 1 make distclean > /dev/null if [ -z "$LIBSODIUM_FULL_BUILD" ]; then - export LIBSODIUM_ENABLE_MINIMAL_FLAG="" -else export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" +else + export LIBSODIUM_ENABLE_MINIMAL_FLAG="" fi ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ diff --git a/dist-build/osx.sh b/dist-build/osx.sh index 4e976aaa..a39857b4 100755 --- a/dist-build/osx.sh +++ b/dist-build/osx.sh @@ -12,9 +12,9 @@ export LDFLAGS="-arch x86_64 -mmacosx-version-min=${OSX_VERSION_MIN} -march=${OS make distclean > /dev/null if [ -z "$LIBSODIUM_FULL_BUILD" ]; then - export LIBSODIUM_ENABLE_MINIMAL_FLAG="" -else export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" +else + export LIBSODIUM_ENABLE_MINIMAL_FLAG="" fi ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \