Skip to content

Commit 3e4fe27

Browse files
committed
Use to_path_s for determine_pkg_config_libdir.
1 parent 0c9047a commit 3e4fe27

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Library/Homebrew/extend/ENV.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
require "extend/ENV/std"
44
require "extend/ENV/super"
55

6+
class Array
7+
def to_path_s
8+
map(&:to_s).uniq.select { |s| File.directory?(s) }.join(File::PATH_SEPARATOR).chuzzle
9+
end
10+
end
11+
612
def superenv?
713
ARGV.env != "std" && Superenv.bin
814
end

Library/Homebrew/extend/ENV/std.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def determine_pkg_config_libdir
6262
paths << "#{HOMEBREW_PREFIX}/share/pkgconfig"
6363
paths += homebrew_extra_pkg_config_paths
6464
paths << "/usr/lib/pkgconfig"
65-
paths.select { |d| File.directory? d }.join(File::PATH_SEPARATOR)
65+
paths.to_path_s
6666
end
6767

6868
# Removes the MAKEFLAGS environment variable, causing make to use a single job.

Library/Homebrew/extend/ENV/super.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,4 @@ def set_cpu_flags(*)
330330
end
331331
end
332332

333-
class Array
334-
def to_path_s
335-
map(&:to_s).uniq.select { |s| File.directory? s }.join(File::PATH_SEPARATOR).chuzzle
336-
end
337-
end
338-
339333
require "extend/os/extend/ENV/super"

0 commit comments

Comments
 (0)