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

super: refactor LLVM path addition.

Browse Source
This commit is contained in:
Mike McQuaid 2018-03-06 08:44:47 +00:00 committed by GitHub
parent 7b94842610
commit 7cb6ebf3fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Library/Homebrew/extend/ENV/super.rb
View File

@ -173,31 +173,22 @@ module Superenv
end end
def determine_library_paths def determine_library_paths
paths = [
keg_only_deps.map(&:opt_lib),
HOMEBREW_PREFIX/"lib",
]
if compiler == :llvm_clang if compiler == :llvm_clang
if MacOS::CLT.installed? if MacOS::CLT.installed?
PATH.new( paths << "/usr/lib"
keg_only_deps.map(&:opt_lib),
HOMEBREW_PREFIX/"lib",
"/usr/lib",
Formula["llvm"].opt_lib.to_s,
homebrew_extra_library_paths,
).existing
else else
PATH.new( paths << "#{MacOS.sdk_path}/usr/lib"
keg_only_deps.map(&:opt_lib),
HOMEBREW_PREFIX/"lib",
"#{MacOS.sdk_path}/usr/lib",
Formula["llvm"].opt_lib.to_s,
homebrew_extra_library_paths,
).existing
end end
else paths << Formula["llvm"].opt_lib.to_s
PATH.new(
keg_only_deps.map(&:opt_lib),
HOMEBREW_PREFIX/"lib",
homebrew_extra_library_paths,
).existing
end end
paths << homebrew_extra_library_paths
PATH.new(paths).existing
end end
def determine_dependencies def determine_dependencies