File tree Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Expand file tree Collapse file tree 1 file changed +7
-0
lines changed Original file line number Diff line number Diff line change @@ -52,6 +52,13 @@ def add_ssl_defines(header)
52
52
# If the user has provided a --with-mysql-dir argument, we must respect it or fail.
53
53
inc , lib = dir_config ( 'mysql' )
54
54
if inc && lib
55
+ # Ruby versions below 2.0 on Unix and below 2.1 on Windows
56
+ # do not properly search for lib directories, and must be corrected:
57
+ # https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
58
+ unless lib && lib [ -3 , 3 ] == 'lib'
59
+ @libdir_basename = 'lib'
60
+ inc , lib = dir_config ( 'mysql' )
61
+ end
55
62
abort "-----\n Cannot find include dir(s) #{ inc } \n -----" unless inc && inc . split ( File ::PATH_SEPARATOR ) . any? { |dir | File . directory? ( dir ) }
56
63
abort "-----\n Cannot find library dir(s) #{ lib } \n -----" unless lib && lib . split ( File ::PATH_SEPARATOR ) . any? { |dir | File . directory? ( dir ) }
57
64
warn "-----\n Using --with-mysql-dir=#{ File . dirname inc } \n -----"
You can’t perform that action at this time.
0 commit comments