diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-20 14:00:15 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-20 14:00:15 +0000 |
commit | e95d69038046f7929721905e95fb454a853b09e3 (patch) | |
tree | 9fe6f2d70c5e3d3e8d828078af103d3b08948f0c | |
parent | 2dc01a5f2f0a0968cf142bf3de06bd0240476722 (diff) | |
download | ruby-e95d69038046f7929721905e95fb454a853b09e3.tar.gz |
ext/extmk.rb: reopen stdout
* ext/extmk.rb (extmake): reopen $stdout to NULL, since setting
$stdout cannot affect child processes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | ext/extmk.rb | 11 |
2 files changed, 12 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun May 20 23:00:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (extmake): reopen $stdout to NULL, since setting + $stdout cannot affect child processes. + Sun May 20 21:36:39 2012 NARUSE, Yui <naruse@ruby-lang.org> * enc/shift_jis.c (code_to_mbclen): return diff --git a/ext/extmk.rb b/ext/extmk.rb index e37ea6613d..9293ecaf87 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -187,15 +187,18 @@ def extmake(target) Logging::logfile 'mkmf.log' rm_f makefile if conf + stdout = $stdout.dup + stderr = $stderr.dup unless verbose? - stdout, $stdout = $stdout, File.open(File::NULL, "a") - else - stdout = $stdout + $stderr.reopen($stdout.reopen(File::NULL)) end begin load $0 = conf ensure - $stdout = stdout + $stderr.reopen(stderr) + $stdout.reopen(stdout) + stdout.close + stderr.close end else create_makefile(target) |