1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb: Revert r45640 because it may lead to link

Browse Source 
with different libruby. [Bug #9760]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
sorah 2015-10-24 12:10:48 +00:00
parent 136b5b752d
commit d9bf31ccef
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Sat Oct 24 15:42:20 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bootstraptest/test_method.rb: relax error message format. * bootstraptest/test_method.rb: relax error message format.

8
lib/mkmf.rb
View File

@ -467,7 +467,7 @@ MSG
end end
end end
def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH) def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH)
librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)" librubyarg = $extmk ? $LIBRUBYARG_STATIC : "$(LIBRUBYARG)"
conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote, conf = RbConfig::CONFIG.merge('hdrdir' => $hdrdir.quote,
'src' => "#{CONFTEST_C}", 'src' => "#{CONFTEST_C}",
@ -503,7 +503,7 @@ MSG
conf) conf)
end end
def libpathflag(libpath=$LIBPATH|$DEFLIBPATH) def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
libpath.map{|x| libpath.map{|x|
case x case x
when "$(topdir)", /\A\./ when "$(topdir)", /\A\./
@ -2179,7 +2179,7 @@ RULES
# #
def create_makefile(target, srcprefix = nil) def create_makefile(target, srcprefix = nil)
$target = target $target = target
libpath = $LIBPATH|$DEFLIBPATH libpath = $DEFLIBPATH|$LIBPATH
message "creating Makefile\n" message "creating Makefile\n"
MakeMakefile.rm_f "#{CONFTEST}*" MakeMakefile.rm_f "#{CONFTEST}*"
if CONFIG["DLEXT"] == $OBJEXT if CONFIG["DLEXT"] == $OBJEXT
@ -2260,7 +2260,7 @@ RULES
conf = yield(conf) if block_given? conf = yield(conf) if block_given?
mfile.puts(conf) mfile.puts(conf)
mfile.print " mfile.print "
libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")} libpath = #{($DEFLIBPATH|$LIBPATH).join(" ")}
LIBPATH = #{libpath} LIBPATH = #{libpath}
DEFFILE = #{deffile} DEFFILE = #{deffile}