diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index 283e90b696..811737f10e 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 aafc0a4519..d64f2185a4 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 4d6d96ad3e..166973e092 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"