From fadfd1a95c566e464238397596109408ebaa2d03 Mon Sep 17 00:00:00 2001
From: larrytaowang <tao.larry.wang@gmail.com>
Date: Mon, 25 Mar 2024 17:46:44 -0700
Subject: [PATCH] fix arch

---
 bluepill/bluepill.xcodeproj/project.pbxproj |  8 ++---
 bp/bp.xcodeproj/project.pbxproj             |  8 ++---
 scripts/bluepill.sh                         | 34 ++++++++++-----------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/bluepill/bluepill.xcodeproj/project.pbxproj b/bluepill/bluepill.xcodeproj/project.pbxproj
index 714f6093..9a2512aa 100644
--- a/bluepill/bluepill.xcodeproj/project.pbxproj
+++ b/bluepill/bluepill.xcodeproj/project.pbxproj
@@ -398,7 +398,7 @@
 			baseConfigurationReference = BAFCCA361E33595F00E33C31 /* bluepill.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -457,7 +457,7 @@
 			baseConfigurationReference = BAFCCA361E33595F00E33C31 /* bluepill.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -507,7 +507,7 @@
 		BAEF4B3C1DAC539400E68294 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "-";
 				DEPLOYMENT_LOCATION = NO;
 				DEVELOPER_PRIVATE_FRAMEWORKS_DIR = "";
@@ -529,7 +529,7 @@
 		BAEF4B3D1DAC539400E68294 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CODE_SIGN_IDENTITY = "-";
 				DEPLOYMENT_LOCATION = NO;
 				DEVELOPER_PRIVATE_FRAMEWORKS_DIR = "";
diff --git a/bp/bp.xcodeproj/project.pbxproj b/bp/bp.xcodeproj/project.pbxproj
index eecbb53c..525a083b 100644
--- a/bp/bp.xcodeproj/project.pbxproj
+++ b/bp/bp.xcodeproj/project.pbxproj
@@ -910,7 +910,7 @@
 			baseConfigurationReference = 7A79018C1D5CF113004D4325 /* bp.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -968,7 +968,7 @@
 			baseConfigurationReference = 7A79018C1D5CF113004D4325 /* bp.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1099,7 +1099,7 @@
 		B368E56B213F8D2F00B4DEA3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -1138,7 +1138,7 @@
 		B368E56C213F8D2F00B4DEA3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = x86_64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
diff --git a/scripts/bluepill.sh b/scripts/bluepill.sh
index 5bda22a4..66992937 100755
--- a/scripts/bluepill.sh
+++ b/scripts/bluepill.sh
@@ -70,23 +70,23 @@ bluepill_build()
   echo Release in "build/$DST.zip"
 }
 
-bluepill_build_sample_app()
-{
-  set -o pipefail
-  xcodebuild build-for-testing \
-    -workspace Bluepill.xcworkspace \
-    -arch x86_64 \
-    -scheme BPSampleApp \
-    -sdk iphonesimulator \
-    -derivedDataPath "$DerivedDataPath" 2>&1 | tee result.txt | $XCPRETTY
-
-  test $? == 0 || {
-          echo Build failed
-          cat result.txt
-          exit 1
-  }
-  set +o pipefail
-}
+# bluepill_build_sample_app()
+# {
+#   set -o pipefail
+#   xcodebuild build-for-testing \
+#     -workspace Bluepill.xcworkspace \
+#     -arch x86_64 \
+#     -scheme BPSampleApp \
+#     -sdk iphonesimulator \
+#     -derivedDataPath "$DerivedDataPath" 2>&1 | tee result.txt | $XCPRETTY
+
+#   test $? == 0 || {
+#           echo Build failed
+#           cat result.txt
+#           exit 1
+#   }
+#   set +o pipefail
+# }
 
 # $1 scheme, $2 extra args for xcodebuild
 run_tests() {