From ce4e4f22762ccf74b9ea413e0d0f6e7e5fa8b073 Mon Sep 17 00:00:00 2001
From: "Lucas.Xu" <lucas.xu@appflowy.io>
Date: Tue, 11 Apr 2023 21:19:37 +0800
Subject: [PATCH] fix: sometimes build error in macOS x86_64 (#2234)

---
 frontend/appflowy_flutter/macos/Podfile       | 24 +++++++++----------
 .../macos/Runner.xcodeproj/project.pbxproj    |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/appflowy_flutter/macos/Podfile b/frontend/appflowy_flutter/macos/Podfile
index 7d7672e61f..715baa2d38 100644
--- a/frontend/appflowy_flutter/macos/Podfile
+++ b/frontend/appflowy_flutter/macos/Podfile
@@ -27,18 +27,18 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 flutter_macos_podfile_setup
 
 def build_specify_archs_only
-  if ENV.has_key?('BUILD_ARCHS')
-    xcodeproj_path = File.dirname(__FILE__) + '/Runner.xcodeproj'
-    project = Xcodeproj::Project.open(xcodeproj_path)
-    project.targets.each do |target|
-      if target.name == 'Runner'
-        target.build_configurations.each do |config|
-          config.build_settings['ARCHS'] = ENV['BUILD_ARCHS']
-        end
-      end
-    end
-    project.save()
-  end
+  # if ENV.has_key?('BUILD_ARCHS')
+  #   xcodeproj_path = File.dirname(__FILE__) + '/Runner.xcodeproj'
+  #   project = Xcodeproj::Project.open(xcodeproj_path)
+  #   project.targets.each do |target|
+  #     if target.name == 'Runner'
+  #       target.build_configurations.each do |config|
+  #         config.build_settings['ARCHS'] = ENV['BUILD_ARCHS']
+  #       end
+  #     end
+  #   end
+  #   project.save()
+  # end
 end
 
 build_specify_archs_only()
diff --git a/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj b/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj
index 7e9dfada08..008928b9c9 100644
--- a/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj
+++ b/frontend/appflowy_flutter/macos/Runner.xcodeproj/project.pbxproj
@@ -417,7 +417,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
 			buildSettings = {
-				ARCHS = arm64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
@@ -551,7 +551,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
 			buildSettings = {
-				ARCHS = arm64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
@@ -576,7 +576,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */;
 			buildSettings = {
-				ARCHS = arm64;
+				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;