diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sat Oct 24 21:06:43 2015 Shota Fukumori (sora_h) <her@sorah.jp> + + * lib/mkmf.rb: Revert r45640 because it may lead to link + with different libruby. [Bug #9760] + Sat Oct 24 15:42:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * bootstraptest/test_method.rb: relax error message format. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1a9b8fb670..d871a9bf82 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -467,7 +467,7 @@ MSG end end - def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH) + def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) 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=$LIBPATH|$DEFLIBPATH) + def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) libpath.map{|x| case x when "$(topdir)", /\A\./ @@ -2179,7 +2179,7 @@ RULES # def create_makefile(target, srcprefix = nil) $target = target - libpath = $LIBPATH|$DEFLIBPATH + libpath = $DEFLIBPATH|$LIBPATH message "creating Makefile\n" MakeMakefile.rm_f "#{CONFTEST}*" if CONFIG["DLEXT"] == $OBJEXT @@ -2260,7 +2260,7 @@ RULES conf = yield(conf) if block_given? mfile.puts(conf) mfile.print " -libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")} +libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")} LIBPATH = #{libpath} DEFFILE = #{deffile} |