summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xext/extmk.rb3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3aef4dde94..8c2a38e716 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 3 20:27:37 2013 Tanaka Akira <akr@fsij.org>
+
+ * ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
+ clause.
+
Wed Apr 3 18:53:58 2013 Tanaka Akira <akr@fsij.org>
* ext/extmk.rb (extmake): Use Logging.open to switch stdout and
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 737e998b28..1a318b38a1 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -230,10 +230,8 @@ def extmake(target)
Logging::message(mess) if Logging.log_opened?
print(mess)
$stdout.flush
- Logging::log_close
return true
end
- Logging::log_close
args = sysquote($mflags)
unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
@@ -265,6 +263,7 @@ def extmake(target)
$extpath |= $LIBPATH
end
ensure
+ Logging::log_close
unless $ignore
RbConfig.module_eval {
remove_const(:CONFIG)