I turned it around.

This commit is contained in:
Daniel Persson 2018-03-06 21:20:17 +01:00
parent 9d582340c4
commit c7f0f05209
6 changed files with 13 additions and 13 deletions

View File

@ -46,9 +46,9 @@ env - PATH="$PATH" \
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1 --arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi fi
./configure \ ./configure \

View File

@ -34,9 +34,9 @@ export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SI
make distclean > /dev/null make distclean > /dev/null
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi fi
./configure --host=i686-apple-darwin10 \ ./configure --host=i686-apple-darwin10 \

View File

@ -20,12 +20,11 @@ mkdir -p $PREFIX || exit 1
make distclean > /dev/null make distclean > /dev/null
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--host=nacl \ --host=nacl \
--disable-ssp --without-pthreads \ --disable-ssp --without-pthreads \

View File

@ -12,11 +12,12 @@ mkdir -p $PREFIX || exit 1
make distclean > /dev/null make distclean > /dev/null
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \
--host=i686-nacl \ --host=i686-nacl \
--disable-ssp --without-pthreads \ --disable-ssp --without-pthreads \

View File

@ -12,9 +12,9 @@ mkdir -p $PREFIX || exit 1
make distclean > /dev/null make distclean > /dev/null
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \

View File

@ -12,9 +12,9 @@ export LDFLAGS="-arch x86_64 -mmacosx-version-min=${OSX_VERSION_MIN} -march=${OS
make distclean > /dev/null make distclean > /dev/null
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal" export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
fi fi
./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \ ./configure ${LIBSODIUM_ENABLE_MINIMAL_FLAG} \