From ffc98b37b96073650e14648c00364bcaf3b64f0f Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 18 Apr 2015 18:41:48 +0200
Subject: [PATCH] Let dist-build/ios.sh compile only for iOS and the iOS
 emulator.

---
 dist-build/ios.sh | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/dist-build/ios.sh b/dist-build/ios.sh
index 057382d5..60638932 100755
--- a/dist-build/ios.sh
+++ b/dist-build/ios.sh
@@ -14,12 +14,11 @@ export IOS32_PREFIX="$PREFIX/tmp/ios32"
 export IOS64_PREFIX="$PREFIX/tmp/ios64"
 export SIMULATOR32_PREFIX="$PREFIX/tmp/simulator32"
 export SIMULATOR64_PREFIX="$PREFIX/tmp/simulator64"
-export OSX_PREFIX="$PREFIX/tmp/osx"
 export IOS_SIMULATOR_VERSION_MIN=${IOS_SIMULATOR_VERSION_MIN-"5.1.1"}
 export IOS_VERSION_MIN=${IOS_VERSION_MIN-"5.1.1"}
 export XCODEDIR=$(xcode-select -p)
 
-mkdir -p $SIMULATOR32_PREFIX $SIMULATOR64_PREFIX $IOS32_PREFIX $IOS64_PREFIX $OSX_PREFIX || exit 1
+mkdir -p $SIMULATOR32_PREFIX $SIMULATOR64_PREFIX $IOS32_PREFIX $IOS64_PREFIX || exit 1
 
 # Build for the simulator
 export BASEDIR="${XCODEDIR}/Platforms/iPhoneSimulator.platform/Developer"
@@ -50,18 +49,6 @@ make distclean > /dev/null
 
 make -j3 install || exit 1
 
-# Build for OSX
-export CFLAGS="-O2 -arch x86_64 -mmacosx-version-min=10.8 -march=core2"
-export LDFLAGS="-arch x86_64 -mmacosx-version-min=10.8"
-
-make distclean > /dev/null
-
-./configure --disable-shared \
-            --enable-minimal \
-            --prefix="$OSX_PREFIX"
-
-make -j3 check && make install || exit 1
-
 # Build for iOS
 export BASEDIR="${XCODEDIR}/Platforms/iPhoneOS.platform/Developer"
 export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH"
@@ -98,7 +85,7 @@ rm -fr -- "$PREFIX/include" "$PREFIX/libsodium.a" 2> /dev/null
 mkdir -p -- "$PREFIX"
 lipo -create \
   "$SIMULATOR32_PREFIX/lib/libsodium.a" \
-  "$OSX_PREFIX/lib/libsodium.a" \
+  "$SIMULATOR64_PREFIX/lib/libsodium.a" \
   "$IOS32_PREFIX/lib/libsodium.a" \
   "$IOS64_PREFIX/lib/libsodium.a" \
   -output "$PREFIX/libsodium.a"