From 23340403c15c4ff814eb7a66d77a71bb57a35d09 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Tue, 28 Jul 2020 12:58:21 +0200
Subject: [PATCH] Fix `effective_arch` on Linux.

---
 Library/Homebrew/extend/os/linux/extend/ENV/shared.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb
index e70ce40cce..b16178cac6 100644
--- 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