diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-19 12:43:57 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-19 12:43:57 +0000 |
| commit | 192f6fd42140d35d247417cce760f86101d8a3e6 (patch) | |
| tree | 43570dc6668272b70026cf9f596e7552dad00d4d | |
| parent | 4f7adc56b7c45c4052ab757baeffa64e96109655 (diff) | |
* ext/extmk.rb (extmake): check if compile before showing message.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ext/extmk.rb | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 778648baa0..8cfccf0ce2 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -95,15 +95,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 @@ -448,7 +439,11 @@ Dir::chdir('ext') hdrdir = $hdrdir $hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..") 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 = "." |
