Merge pull request #8119 from reitermarkus/effective-arch

Fix `effective_arch` on Linux.
2020-07-28 12:29:07 +01:00 · 2020-07-28 12:29:07 +01:00 · 1c84c37f49
commit 1c84c37f49
parent 7279e6f465 23340403c1
1 changed files with 3 additions and 3 deletions
--- a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
@ -3,9 +3,9 @@
 module SharedEnvExtension
  # @private
  def effective_arch
-    if @args&.build_bottle? && @args&.bottle_arch
-      @args.bottle_arch.to_sym
-    elsif @args&.build_bottle?
+    if @build_bottle && @bottle_arch
+      @bottle_arch.to_sym
+    elsif @build_bottle
      Hardware.oldest_cpu
    else
      :native