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

Merge pull request #4441 from MikeMcQuaid/fewer-mojave-force-links

Browse Source 
link: stop unneeded force linking on Mojave/CLT 10.
This commit is contained in:
Mike McQuaid 2018-07-09 16:47:26 +01:00 committed by GitHub
commit d445406596
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Library/Homebrew/cmd/link.rb
View File

@ -27,16 +27,27 @@ module Homebrew
ARGV.kegs.each do |keg| ARGV.kegs.each do |keg|
keg_only = Formulary.keg_only?(keg.rack) keg_only = Formulary.keg_only?(keg.rack)
if HOMEBREW_PREFIX.to_s == "/usr/local" && keg_only && if HOMEBREW_PREFIX.to_s == "/usr/local" && keg_only
keg.name.start_with?("openssl", "libressl") if keg.name.start_with?("openssl", "libressl")
opoo <<~EOS opoo <<~EOS
Refusing to link: #{keg.name} Refusing to link: #{keg.name}
Linking keg-only #{keg.name} means you may end up linking against the insecure, Linking keg-only #{keg.name} means you may end up linking against the insecure,
deprecated system OpenSSL while using the headers from Homebrew's #{keg.name}. deprecated system OpenSSL while using the headers from Homebrew's #{keg.name}.
Instead, pass the full include/library paths to your compiler e.g.: Instead, pass the full include/library paths to your compiler e.g.:
-I#{HOMEBREW_PREFIX}/opt/#{keg.name}/include -L#{HOMEBREW_PREFIX}/opt/#{keg.name}/lib -I#{HOMEBREW_PREFIX}/opt/#{keg.name}/include -L#{HOMEBREW_PREFIX}/opt/#{keg.name}/lib
EOS EOS
next next
elsif (MacOS.version >= :mojave ||
MacOS::Xcode.version >= "10.0" ||
MacOS::CLT.version >= "10.0") &&
dep_f.keg_only_reason.reason == :provided_by_macos
opoo <<~EOS
Refusing to link macOS-provided software: #{keg.name}
Instead, pass the full include/library paths to your compiler e.g.:
-I#{HOMEBREW_PREFIX}/opt/#{keg.name}/include -L#{HOMEBREW_PREFIX}/opt/#{keg.name}/lib
EOS
next
end
elsif keg.linked? elsif keg.linked?
opoo "Already linked: #{keg}" opoo "Already linked: #{keg}"
puts "To relink: brew unlink #{keg.name} && brew link #{keg.name}" puts "To relink: brew unlink #{keg.name} && brew link #{keg.name}"