From 74e7f814ae283dac667c9995774ab48b9a7f565d Mon Sep 17 00:00:00 2001
From: Ben Chatelain <ben@octop.ad>
Date: Mon, 7 Sep 2020 10:09:28 -0600
Subject: [PATCH] =?UTF-8?q?=F0=9F=8D=BA=20Update=20formula=20with=20differ?=
 =?UTF-8?q?ences=20from=20homebrew-core?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Homebrew/mas-tap.rb | 10 +++++++---
 Homebrew/mas.rb     | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Homebrew/mas-tap.rb b/Homebrew/mas-tap.rb
index 0a7484b..949be54 100644
--- a/Homebrew/mas-tap.rb
+++ b/Homebrew/mas-tap.rb
@@ -2,8 +2,9 @@ class Mas < Formula
   desc "Mac App Store command-line interface"
   homepage "https://github.com/mas-cli/mas"
   url "https://github.com/mas-cli/mas.git",
-      :tag      => "v1.7.1",
-      :revision => "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8"
+      tag:      "v1.7.1",
+      revision: "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8"
+  license "MIT"
   head "https://github.com/mas-cli/mas.git"
 
   bottle do
@@ -17,16 +18,19 @@ class Mas < Formula
   end
 
   depends_on "carthage" => :build
-  depends_on :xcode => ["10.2", :build]
+  depends_on xcode: ["10.2", :build]
 
   def install
     # Working around build issues in dependencies
     # - Prevent warnings from causing build failures
     # - Prevent linker errors by telling all lib builds to use max size install names
+    # - Ensure dependencies build for the current CPU; otherwise Commandant will
+    #   build for x86_64 when running arm64
     xcconfig = buildpath/"Overrides.xcconfig"
     xcconfig.write <<~EOS
       GCC_TREAT_WARNINGS_AS_ERRORS = NO
       OTHER_LDFLAGS = -headerpad_max_install_names
+      VALID_ARCHS = #{Hardware::CPU.arch}
     EOS
     ENV["XCODE_XCCONFIG_FILE"] = xcconfig
 
diff --git a/Homebrew/mas.rb b/Homebrew/mas.rb
index 4a3d770..19a40d4 100644
--- a/Homebrew/mas.rb
+++ b/Homebrew/mas.rb
@@ -2,8 +2,9 @@ class Mas < Formula
   desc "Mac App Store command-line interface"
   homepage "https://github.com/mas-cli/mas"
   url "https://github.com/mas-cli/mas.git",
-      :tag      => "v1.7.1",
-      :revision => "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8"
+      tag:      "v1.7.1",
+      revision: "b8dcb4ce4b1d78ada7556565dd5c73e9913758d8"
+  license "MIT"
   head "https://github.com/mas-cli/mas.git"
 
   bottle do
@@ -13,16 +14,19 @@ class Mas < Formula
   end
 
   depends_on "carthage" => :build
-  depends_on :xcode => ["10.2", :build]
+  depends_on xcode: ["10.2", :build]
 
   def install
     # Working around build issues in dependencies
     # - Prevent warnings from causing build failures
     # - Prevent linker errors by telling all lib builds to use max size install names
+    # - Ensure dependencies build for the current CPU; otherwise Commandant will
+    #   build for x86_64 when running arm64
     xcconfig = buildpath/"Overrides.xcconfig"
     xcconfig.write <<~EOS
       GCC_TREAT_WARNINGS_AS_ERRORS = NO
       OTHER_LDFLAGS = -headerpad_max_install_names
+      VALID_ARCHS = #{Hardware::CPU.arch}
     EOS
     ENV["XCODE_XCCONFIG_FILE"] = xcconfig