diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 283e90b696bf1e570ee0e8010a53265a23ee1232..811737f10e7498391b4e8aa884f3c07e5de07858 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -3,6 +3,12 @@ require "extend/ENV/shared" require "extend/ENV/std" require "extend/ENV/super" +class Array + def to_path_s + map(&:to_s).uniq.select { |s| File.directory?(s) }.join(File::PATH_SEPARATOR).chuzzle + end +end + def superenv? ARGV.env != "std" && Superenv.bin end diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index aafc0a451934229829942bc62fe2340ff4796568..d64f2185a4fc480cbdcb8e37a3d5860185cd3fca 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -62,7 +62,7 @@ module Stdenv paths << "#{HOMEBREW_PREFIX}/share/pkgconfig" paths += homebrew_extra_pkg_config_paths paths << "/usr/lib/pkgconfig" - paths.select { |d| File.directory? d }.join(File::PATH_SEPARATOR) + paths.to_path_s end # Removes the MAKEFLAGS environment variable, causing make to use a single job. diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 4d6d96ad3e39d93e80ea47213fb84825c7572035..166973e0927714cbe50705201f087d9a66e1b9f6 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -330,10 +330,4 @@ module Superenv end end -class Array - def to_path_s - map(&:to_s).uniq.select { |s| File.directory? s }.join(File::PATH_SEPARATOR).chuzzle - end -end - require "extend/os/extend/ENV/super"