aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/extmk.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 70876bd6c6..6e65099dcb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-Tue Mar 3 14:53:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Mar 3 14:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (main): passes $(MAKE) to mkmain_cmd
+ * ext/extmk.rb (extmake): removes object files no longer used.
+
* ext/extmk.rb (command_output): uses arguments to invoke make.
Tue Mar 3 01:56:03 2009 Tanaka Akira <akr@fsij.org>
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 69002236c5..a315435a01 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -138,6 +138,7 @@ def extmake(target)
begin
$extconf_h = nil
ok &&= extract_makefile(makefile)
+ old_objs = $objs
conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
if (($extconf_h && !File.exist?($extconf_h)) ||
!(t = modified?(makefile, MTIMES)) ||
@@ -178,6 +179,7 @@ def extmake(target)
args += ["static"] unless $clean
$extlist.push [$static, $target, File.basename($target), $preload]
end
+ FileUtils.rm_f($objs.split - old_objs)
unless system($make, *args)
$ignore or $continue or return false
end