summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-05-18 13:42:07 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-05-18 13:42:07 +0200
commite995e22fed3d0debe1e222dd653f79e8c52c711c (patch)
treeac457f4cb8ed4cbb7f6df697709e3177606be971
parentFixed ICE-7885 - IceBridge/simple test failure, debugging info for ICE-7886 (diff)
downloadice-e995e22fed3d0debe1e222dd653f79e8c52c711c.tar.bz2
ice-e995e22fed3d0debe1e222dd653f79e8c52c711c.tar.xz
ice-e995e22fed3d0debe1e222dd653f79e8c52c711c.zip
Fixed iOS device build to build armv7/arm64 instead of armv7s/arm64 to match Xcode ARCHS_STANDARD default
-rw-r--r--config/Make.rules.Darwin4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/Make.rules.Darwin b/config/Make.rules.Darwin
index 16b2aad47c7..16aaf981048 100644
--- a/config/Make.rules.Darwin
+++ b/config/Make.rules.Darwin
@@ -18,8 +18,8 @@ macosx_targetdir = $(if $(filter %/build,$5),/macosx)
iphoneos_ar = libtool
iphoneos_cc = xcrun -sdk iphoneos clang
iphoneos_cxx = xcrun -sdk iphoneos clang++
-iphoneos_cppflags = -miphoneos-version-min=7.1 -arch armv7s -arch arm64 -fembed-bitcode
-iphoneos_ldflags = -miphoneos-version-min=7.1 -arch armv7s -arch arm64
+iphoneos_cppflags = -miphoneos-version-min=7.1 -arch armv7 -arch arm64 -fembed-bitcode
+iphoneos_ldflags = -miphoneos-version-min=7.1 -arch armv7 -arch arm64
iphoneos_configs = %xcodesdk
iphoneos_targetdir = $(if $(filter %/build,$5),/iphoneos)