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

mkmf.rb: prefer $LIBPATH than $DEFLIBPATH

Browse Source 
* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
  user specified `$LIBPATH` than `$DEFLIBPATH`.  [ruby-core:62100]
  [ruby-trunk - Bug #9760]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-04-19 23:41:36 +00:00
parent 6209b66b8c
commit 69ce2b7037
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> Sun Apr 20 06:01:18 2014 Eric Wong <e@80x24.org>
* gc.c (rb_gc_writebarrier): drop special case for big hash/array * gc.c (rb_gc_writebarrier): drop special case for big hash/array

8
lib/mkmf.rb
View File

@ -467,7 +467,7 @@ MSG
end end
end end
def link_command(ldflags, opt="", libpath=$DEFLIBPATH|$LIBPATH) def link_command(ldflags, opt="", libpath=$LIBPATH|$DEFLIBPATH)
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=$DEFLIBPATH|$LIBPATH) def libpathflag(libpath=$LIBPATH|$DEFLIBPATH)
libpath.map{|x| libpath.map{|x|
case x case x
when "$(topdir)", /\A\./ when "$(topdir)", /\A\./
@ -2125,7 +2125,7 @@ RULES
# #
def create_makefile(target, srcprefix = nil) def create_makefile(target, srcprefix = nil)
$target = target $target = target
libpath = $DEFLIBPATH|$LIBPATH libpath = $LIBPATH|$DEFLIBPATH
message "creating Makefile\n" message "creating Makefile\n"
MakeMakefile.rm_f "#{CONFTEST}*" MakeMakefile.rm_f "#{CONFTEST}*"
if CONFIG["DLEXT"] == $OBJEXT if CONFIG["DLEXT"] == $OBJEXT
@ -2206,7 +2206,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 = #{($DEFLIBPATH|$LIBPATH).join(" ")} libpath = #{($LIBPATH|$DEFLIBPATH).join(" ")}
LIBPATH = #{libpath} LIBPATH = #{libpath}
DEFFILE = #{deffile} DEFFILE = #{deffile}