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

Diagnostic: remove need for headers on 10.14

Browse Source
This commit is contained in:
Misty De Meo 2018-07-06 15:19:44 -07:00
parent 160534983f
commit 0cd8427405
No known key found for this signature in database
GPG Key ID: 76CF846A2F674B2C
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/extend/os/mac/diagnostic.rb
View File

@ -20,7 +20,6 @@ module Homebrew
check_xcode_minimum_version check_xcode_minimum_version
check_clt_minimum_version check_clt_minimum_version
check_if_xcode_needs_clt_installed check_if_xcode_needs_clt_installed
check_if_clt_needs_headers_installed
].freeze ].freeze
end end
@ -138,17 +137,6 @@ module Homebrew
EOS EOS
end end
def check_if_clt_needs_headers_installed
return unless MacOS::CLT.separate_header_package?
return if MacOS::CLT.headers_installed?
<<~EOS
The Command Line Tools header package must be installed on #{MacOS.version.pretty_name}.
The installer is located at:
#{MacOS::CLT::HEADER_PKG_PATH.sub(":macos_version", MacOS.version)}
EOS
end
def check_for_other_package_managers def check_for_other_package_managers
ponk = MacOS.macports_or_fink ponk = MacOS.macports_or_fink
return if ponk.empty? return if ponk.empty?

13
Library/Homebrew/test/os/mac/diagnostic_spec.rb
View File

@ -32,19 +32,6 @@ describe Homebrew::Diagnostic::Checks do
.to match("Xcode alone is not sufficient on El Capitan") .to match("Xcode alone is not sufficient on El Capitan")
end end
specify "#check_if_clt_needs_headers_installed" do
allow(MacOS).to receive(:version).and_return(OS::Mac::Version.new("10.14"))
allow(MacOS::CLT).to receive(:installed?).and_return(true)
allow(MacOS::CLT).to receive(:headers_installed?).and_return(false)
expect(subject.check_if_clt_needs_headers_installed)
.to match("The Command Line Tools header package must be installed on Mojave.")
allow(MacOS).to receive(:version).and_return(OS::Mac::Version.new("10.13"))
expect(subject.check_if_clt_needs_headers_installed)
.to be_nil
end
specify "#check_homebrew_prefix" do specify "#check_homebrew_prefix" do
# the integration tests are run in a special prefix # the integration tests are run in a special prefix
expect(subject.check_homebrew_prefix) expect(subject.check_homebrew_prefix)