admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #10159 from MikeMcQuaid/formula_installer_mac_build_from_source

Browse Source 
formula_installer: only require --build-from-source on macOS.
This commit is contained in:
Mike McQuaid 2020-12-28 10:14:15 +00:00 committed by GitHub
commit b1ea9e5510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cli/args.rb
View File

@ -69,7 +69,7 @@ module Homebrew
end end
def build_from_source_formulae def build_from_source_formulae
if build_from_source? || build_bottle? if build_from_source? || HEAD? || build_bottle?
named.to_formulae_and_casks.select { |f| f.is_a?(Formula) }.map(&:full_name) named.to_formulae_and_casks.select { |f| f.is_a?(Formula) }.map(&:full_name)
else else
[] []

3
Library/Homebrew/formula_installer.rb
View File

@ -233,6 +233,9 @@ class FormulaInstaller
end end
if Homebrew.default_prefix? && !Homebrew::EnvConfig.developer? && if Homebrew.default_prefix? && !Homebrew::EnvConfig.developer? &&
# TODO: re-enable this on Linux when we merge linuxbrew-core into
# homebrew-core and have full bottle coverage.
(OS.mac? || ENV["CI"]) &&
!build_from_source? && !build_bottle? && !build_from_source? && !build_bottle? &&
!installed_as_dependency? && !installed_as_dependency? &&
formula.tap&.core_tap? && !formula.bottle_unneeded? && !formula.any_version_installed? && formula.tap&.core_tap? && !formula.bottle_unneeded? && !formula.any_version_installed? &&