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

Use to_path_s for determine_pkg_config_libdir.

Browse Source
This commit is contained in:
Markus Reiter 2017-04-25 19:04:00 +02:00
parent 0c9047a2b8
commit 3e4fe279b0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/extend/ENV.rb
View File

@ -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

2
Library/Homebrew/extend/ENV/std.rb
View File

@ -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.

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

@ -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"