macos: Build afscell for supported architectures

Given that i386 is no longer supported, trying to build the current
version of afscell on macOS 11 (Big Sur) results in the following error:

error: The i386 architecture is deprecated. You should update your ARCHS
build setting to remove the i386 architecture.

To fix this problem, build afscell for all architectures listed in
ARCHS_STANDARD.

For the macosx11.0 sdk:

$ xcodebuild -showBuildSettings -scheme afscell -sdk macosx | grep ARCHS

    ARCHS = arm64 x86_64
    ARCHS_STANDARD = arm64 x86_64
    ARCHS_STANDARD_32_64_BIT = arm64 x86_64 i386
    ARCHS_STANDARD_32_BIT = i386
    ARCHS_STANDARD_64_BIT = arm64 x86_64
    ARCHS_STANDARD_INCLUDING_64_BIT = arm64 x86_64
    VALID_ARCHS = arm64 arm64e i386 x86_64

While here, add arm64 to the list of valid architectures.

Change-Id: I37230e49ff5884234b8195bc49ce8b8938580c9e
Reviewed-on: https://gerrit.openafs.org/14745
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>

diff --git a/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj b/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj
index bb271cf..8fbf8b8 100644 (file)
--- a/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj
+++ b/src/platform/DARWIN/AFSPreference/OpenAFS.xcodeproj/project.pbxproj
@@ -887,7 +887,7 @@
                                ONLY_ACTIVE_ARCH = NO;
                                PREBINDING = NO;
                                SKIP_INSTALL = NO;
-                               VALID_ARCHS = "i386 ppc x86_64 armv6";
+                               VALID_ARCHS = "i386 ppc x86_64 armv6 arm64";
                        };
                        name = Debug;
                };
@@ -906,7 +906,7 @@
                                GCC_WARN_UNUSED_VARIABLE = YES;
                                ONLY_ACTIVE_ARCH = NO;
                                PREBINDING = NO;
-                               VALID_ARCHS = "i386 ppc x86_64 armv6";
+                               VALID_ARCHS = "i386 ppc x86_64 armv6 arm64";
                        };
                        name = Release;
                };

diff --git a/src/platform/DARWIN/afscell/afscell.xcodeproj/project.pbxproj b/src/platform/DARWIN/afscell/afscell.xcodeproj/project.pbxproj
index 4981798..ffefcc2 100644 (file)
--- a/src/platform/DARWIN/afscell/afscell.xcodeproj/project.pbxproj
+++ b/src/platform/DARWIN/afscell/afscell.xcodeproj/project.pbxproj
@@ -213,8 +213,8 @@
                B44174E708BA33C40065BEDE /* Debug */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-                               ONLY_ACTIVE_ARCH = YES;
+                               ARCHS = "$(ARCHS_STANDARD)";
+                               ONLY_ACTIVE_ARCH = NO;
                                COPY_PHASE_STRIP = NO;
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
@@ -233,13 +233,8 @@
                B44174E808BA33C40065BEDE /* Release */ = {
                        isa = XCBuildConfiguration;
                        buildSettings = {
-                               ARCHS = (
-                                       ppc,
-                                       i386,
-                                       x86_64,
-                               );
-                               ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-                               ONLY_ACTIVE_ARCH = YES;
+                               ARCHS = "$(ARCHS_STANDARD)";
+                               ONLY_ACTIVE_ARCH = NO;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = G5;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;