diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sun Apr 20 08:41:33 2014 Andrew DeMaria <ademariad@gmail.com> + + * lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer + user specified `$LIBPATH` than `$DEFLIBPATH`. [ruby-core:62100] + [ruby-trunk - Bug #9760] + Sun Apr 20 06:01:18 2014 Eric Wong <e@80x24.org> * gc.c (rb_gc_writebarrier): drop special case for big hash/array diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1da0e59915..a8553fc07d 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -467,7 +467,7 @@ MSG end end - def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) + def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH) librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)" conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, 'src' => "#{CONFTEST_C}", @@ -503,7 +503,7 @@ MSG conf) end - def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) + def libpathflag(libpath=$LIBPATH|$DEFLIBPATH) libpath.map{|x| case x when "$(topdir)", /\A\./ @@ -2125,7 +2125,7 @@ RULES # def create_makefile(target, srcprefix = nil) $target = target - libpath = $DEFLIBPATH|$LIBPATH + libpath = $LIBPATH|$DEFLIBPATH message "creating Makefile\n" MakeMakefile.rm_f "#{CONFTEST}*" if CONFIG["DLEXT"] == $OBJEXT @@ -2206,7 +2206,7 @@ RULES conf = yield(conf) if block_given? mfile.puts(conf) mfile.print " -libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")} +libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")} LIBPATH = #{libpath} DEFFILE = #{deffile} |