Revert "Only build arm64 if 7.0 SDK is present"

This reverts commit d4bca3a8fbb6f77c32b0ef784b77ebb172cdd6fd.

5 files changed, 15 insertions, 28 deletions

diff --git a/scripts/build-mailcore2-ios.sh b/scripts/build-mailcore2-ios.sh
index e04755b3..a505fce0 100755
--- a/scripts/build-mailcore2-ios.sh
+++ b/scripts/build-mailcore2-ios.sh
@@ -2,10 +2,8 @@
 
 if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
 	sdkversion=6.1
-         devicearchs="armv7 armv7s"
 elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
 	sdkversion=7.0
-         devicearchs="armv7 armv7s arm64"
 else
 	echo SDK not found
 	exit 1
@@ -56,16 +54,17 @@ done
 echo building mailcore2
 cd "$srcdir/mailcore2/build-mac"
 sdk="iphoneos$sdkversion"
+archs="armv7 armv7s"
 echo building $sdk
-xcodebuild -project mailcore2.xcodeproj -sdk $sdk -target "static mailcore2 ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs"
+xcodebuild -project mailcore2.xcodeproj -sdk $sdk -target "static mailcore2 ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs"
 if test x$? != x0 ; then
   echo failed
   exit 1
 fi
 sdk="iphonesimulator$sdkversion"
-simarchs="i386"
+archs="i386"
 echo building $sdk
-xcodebuild -project mailcore2.xcodeproj -sdk $sdk -target "static mailcore2 ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs"
+xcodebuild -project mailcore2.xcodeproj -sdk $sdk -target "static mailcore2 ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs"
 if test x$? != x0 ; then
   echo failed
   exit 1
diff --git a/scripts/prepare-ctemplate-ios.sh b/scripts/prepare-ctemplate-ios.sh
index 19a1f7d4..5185cb98 100755
--- a/scripts/prepare-ctemplate-ios.sh
+++ b/scripts/prepare-ctemplate-ios.sh
@@ -4,10 +4,8 @@ url="https://github.com/dinhviethoa/ctemplate"
 
 if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
 	sdkversion=6.1
-         MARCHS="armv7 armv7s"
 elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
 	sdkversion=7.0
-         MARCHS="armv7 armv7s arm64"
 else
 	echo SDK not found
 	exit 1
@@ -72,6 +70,7 @@ sdk="iphoneos$sdkversion"
 sysroot="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$sdkversion.sdk"
 
 ARCH=arm
+MARCHS="armv7 armv7s"
 for MARCH in $MARCHS; do
   echo "$logdir/ctemplate-build.log"
   export CFLAGS="-arch ${MARCH} -isysroot $sysroot"
diff --git a/scripts/prepare-icu4c-ios.sh b/scripts/prepare-icu4c-ios.sh
index a6a6b0aa..b09daff7 100755
--- a/scripts/prepare-icu4c-ios.sh
+++ b/scripts/prepare-icu4c-ios.sh
@@ -2,10 +2,8 @@
 
 if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
 	sdkversion=6.1
-          archs="armv7 armv7s i386"
 elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
 	sdkversion=7.0
-         archs="armv7 armv7s arm64 i386"
 else
 	echo SDK not found
 	exit 1
@@ -83,15 +81,7 @@ make >> "$logdir/icu4c-build.log"
 make install "prefix=$tmpdir/crossbuild/icu4c-$MARCH" >> "$logdir/icu4c-build.log"
 
 ARCH=arm
-if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
-          MARCHS="armv7 armv7s"
-elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
-	sdkversion=7.0
-         MARCHS="armv7 armv7s arm64"
-else
-	echo SDK not found
-	exit 1
-fi	
+MARCHS="armv7 armv7s"
 
 iphonesdk="iphoneos$sdkversion"
 sysroot="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$sdkversion.sdk"
@@ -157,6 +147,7 @@ iculx_paths=""
 icutest_paths=""
 icutu_paths=""
 icuuc_paths=""
+archs="armv7 armv7s i386"
 for cur_arch in $archs ; do
 	icudata_paths="$icudata_paths icu4c-$cur_arch/lib/libicudata.a"
 	icui18n_paths="$icui18n_paths icu4c-$cur_arch/lib/libicui18n.a"
diff --git a/scripts/prepare-libetpan-ios.sh b/scripts/prepare-libetpan-ios.sh
index 414e7ed7..9a3bd3e0 100755
--- a/scripts/prepare-libetpan-ios.sh
+++ b/scripts/prepare-libetpan-ios.sh
@@ -2,10 +2,8 @@
 
 if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
 	sdkversion=6.1
-         devicearchs="armv7 armv7s"
 elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
 	sdkversion=7.0
-         devicearchs="armv7 armv7s arm64"
 else
 	echo SDK not found
 	exit 1
@@ -73,16 +71,17 @@ echo building libetpan
 
 cd "$srcdir/libetpan/build-mac"
 sdk="iphoneos$sdkversion"
+archs="armv7 armv7s arm64"
 echo building $sdk
-xcodebuild -project libetpan.xcodeproj -sdk $sdk -target "libetpan ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs"
+xcodebuild -project libetpan.xcodeproj -sdk $sdk -target "libetpan ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs"
 if test x$? != x0 ; then
   echo failed
   exit 1
 fi
 sdk="iphonesimulator$sdkversion"
-simarchs="i386"
+archs="i386"
 echo building $sdk
-xcodebuild -project libetpan.xcodeproj -sdk $sdk -target "libetpan ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs"
+xcodebuild -project libetpan.xcodeproj -sdk $sdk -target "libetpan ios" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs"
 if test x$? != x0 ; then
   echo failed
   exit 1
diff --git a/scripts/prepare-tidy-ios.sh b/scripts/prepare-tidy-ios.sh
index 1fca5900..045613ec 100755
--- a/scripts/prepare-tidy-ios.sh
+++ b/scripts/prepare-tidy-ios.sh
@@ -2,10 +2,8 @@
 
 if xcodebuild -showsdks|grep iphoneos6.1 >/dev/null ; then
 	sdkversion=6.1
-         devicearchs="armv7 armv7s"
 elif xcodebuild -showsdks|grep iphoneos7.0 >/dev/null ; then
 	sdkversion=7.0
-         devicearchs="armv7 armv7s arm64"
 else
 	echo SDK not found
 	exit 1
@@ -64,16 +62,17 @@ echo building tidy-html5
 
 cd "$srcdir/tidy-html5/build-mac"
 sdk="iphoneos$sdkversion"
+archs="armv7 armv7s arm64"
 echo building $sdk
-xcodebuild -project Tidy.xcodeproj -sdk $sdk -target "tidy" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$devicearchs" >/dev/null 2>&1
+xcodebuild -project Tidy.xcodeproj -sdk $sdk -target "tidy" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs" >/dev/null 2>&1
 if test x$? != x0 ; then
   echo failed
   exit 1
 fi
 sdk="iphonesimulator$sdkversion"
-simarchs="i386"
+archs="i386"
 echo building $sdk
-xcodebuild -project Tidy.xcodeproj -sdk $sdk -target "tidy" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$simarchs" >/dev/null 2>&1
+xcodebuild -project Tidy.xcodeproj -sdk $sdk -target "tidy" -configuration Release SYMROOT="$tmpdir/bin" OBJROOT="$tmpdir/obj" ARCHS="$archs" >/dev/null 2>&1
 if test x$? != x0 ; then
   echo failed
   exit 1