Change so we set depending on a full build flag.

This commit is contained in:
Daniel Persson 2018-03-06 21:10:05 +01:00
parent 2f4d911300
commit 9d582340c4
6 changed files with 19 additions and 6 deletions

View File

@ -45,7 +45,9 @@ env - PATH="$PATH" \
"$MAKE_TOOLCHAIN" --force --api="$NDK_API_VERSION_COMPAT" \
--arch="$ARCH" --install-dir="$TOOLCHAIN_DIR" || exit 1
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
fi

View File

@ -33,7 +33,9 @@ export LDFLAGS="-arch i386 -isysroot ${SDK} -mios-simulator-version-min=${IOS_SI
make distclean > /dev/null
if [ -z "$LIBSODIUM_ENABLE_MINIMAL_FLAG" ]; then
if [ -z "$LIBSODIUM_FULL_BUILD" ]; then
export LIBSODIUM_ENABLE_MINIMAL_FLAG=""
else
export LIBSODIUM_ENABLE_MINIMAL_FLAG="--enable-minimal"
fi

View File

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

View File

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

View File

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

View File

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