archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 13:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

extmk.rb: fix for static-linked-ext

Browse source 
* ext/extmk.rb (extmake): fix up r57424 for static-linked-ext.
  separate maybestatic argument from basedir which is given always
  now.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-01-27 08:05:06 +00:00
parent dbacbc440f
commit 3d5facc48f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/extmk.rb
View file

@ -130,7 +130,7 @@ def extract_makefile(makefile, keep = true)
true true
end end
def extmake(target, basedir = (maybestatic = 'ext')) def extmake(target, basedir = 'ext', maybestatic = true)
unless $configure_only || verbose? unless $configure_only || verbose?
print "#{$message} #{target}\n" print "#{$message} #{target}\n"
$stdout.flush $stdout.flush
@ -590,7 +590,7 @@ exts.each do |d|
$static = $force_static ? true : $static_ext[d] $static = $force_static ? true : $static_ext[d]
if $ignore or !$nodynamic or $static if $ignore or !$nodynamic or $static
result = extmake(d, ext_prefix) or abort result = extmake(d, ext_prefix, !@gemname) or abort
extso |= $extso extso |= $extso
fails << result unless result == true fails << result unless result == true
end end