From 8aa74a17efa7d576d0d39cff3a3ca19392d9a24b Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 19 Jun 2008 12:43:57 +0000 Subject: [PATCH] * ext/extmk.rb (extmake): check if compile before showing message. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/extmk.rb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/ext/extmk.rb b/ext/extmk.rb index ab2ae4f3ee..52f10defea 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -87,15 +87,6 @@ end 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 @@ -439,7 +430,11 @@ Dir::chdir('ext') 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 = "."