Skip to content

Commit 7142a01

Browse files
committed
Merge pull request #491 from sodabrew/extconf_path_separator
Check that dir_config returns at least one valid directory
2 parents f19ff01 + 9032510 commit 7142a01

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/mysql2/extconf.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def asplode lib
4141
@libdir_basename = 'lib'
4242
inc, lib = dir_config('mysql')
4343
end
44-
abort "-----\nCannot find include dir at #{inc}\n-----" unless inc && File.directory?(inc)
45-
abort "-----\nCannot find library dir at #{lib}\n-----" unless lib && File.directory?(lib)
44+
abort "-----\nCannot find include dir(s) #{inc}\n-----" unless inc && inc.split(File::PATH_SEPARATOR).any?{|dir| File.directory?(dir)}
45+
abort "-----\nCannot find library dir(s) #{lib}\n-----" unless lib && lib.split(File::PATH_SEPARATOR).any?{|dir| File.directory?(dir)}
4646
warn "-----\nUsing --with-mysql-dir=#{File.dirname inc}\n-----"
4747
rpath_dir = lib
4848
elsif mc = (with_config('mysql-config') || Dir[GLOB].first)

0 commit comments

Comments
 (0)