From 3588e6a5c6e6dd55058246b3ead00be8e71d365c Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 19 May 2020 08:47:59 +0100 Subject: [PATCH] bottle_arch: ensure a symbol is used when needed. Fixes #7597. --- Library/Homebrew/extend/ENV/shared.rb | 2 +- Library/Homebrew/extend/os/linux/extend/ENV/shared.rb | 6 ++++-- Library/Homebrew/formula_installer.rb | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb index e4a15d2993..36b84cf50b 100644 --- a/Library/Homebrew/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/ENV/shared.rb @@ -255,7 +255,7 @@ module SharedEnvExtension # @private def effective_arch if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch - Homebrew.args.bottle_arch + Homebrew.args.bottle_arch.to_sym else Hardware.oldest_cpu end diff --git a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb index 0ebba4f6bc..a7eb3b9671 100644 --- a/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb +++ b/Library/Homebrew/extend/os/linux/extend/ENV/shared.rb @@ -3,8 +3,10 @@ module SharedEnvExtension # @private def effective_arch - if Homebrew.args.build_bottle? - Homebrew.args.bottle_arch || Hardware.oldest_cpu + if Homebrew.args.build_bottle? && Homebrew.args.bottle_arch + Homebrew.args.bottle_arch.to_sym + elsif Homebrew.args.build_bottle? + Hardware.oldest_cpu else :native end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 18ed7cb437..c2f07c73e2 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -269,7 +269,7 @@ class FormulaInstaller return if only_deps? - if build_bottle? && (arch = Homebrew.args.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch) + if build_bottle? && (arch = Homebrew.args.bottle_arch) && !Hardware::CPU.optimization_flags.include?(arch.to_sym) raise "Unrecognized architecture for --bottle-arch: #{arch}" end