From 7b94842610119cb12c4ac706e936565d3cfbb98e Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Wed, 28 Feb 2018 09:26:15 -0500 Subject: [PATCH] Split ternary for PATH building into if/else cases --- Library/Homebrew/extend/ENV/super.rb | 32 ++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index ce17af5ca3..c3806d421e 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -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