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

Split ternary for PATH building into if/else cases

Browse Source
This commit is contained in:
Alex Wang 2018-02-28 09:26:15 -05:00
parent bfa474857a
commit 7b94842610
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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