Skip to content

Commit

Permalink
* ext/extmk.rb (extmake): check if compile before showing message.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Jun 19, 2008
1 parent 4678de4 commit 6146ef0
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions ext/extmk.rb
Expand Up @@ -87,15 +87,6 @@ def extract_makefile(makefile, keep = true)
def extmake(target)
print "#{$message} #{target}\n"
$stdout.flush
if $force_static or $static_ext[target]
$static = target
else
$static = false
end

unless $ignore
return true if $nodynamic and not $static
end

FileUtils.mkpath target unless File.directory?(target)
begin
Expand Down Expand Up @@ -439,7 +430,11 @@ def $mflags.defined?(var)
hdrdir = $hdrdir
$hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
exts.each do |d|
extmake(d) or abort
$static = $force_static ? $static_ext[target] : false

if $ignore or !$nodynamic or $static
extmake(d) or abort
end
end
$top_srcdir = srcdir
$topdir = "."
Expand Down

0 comments on commit 6146ef0

Please sign in to comment.