diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 07:25:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 07:25:50 +0000 |
| commit | 9bd337c8fd9f6a345e74b84515ecb40301e9f32f (patch) | |
| tree | 6df99abb666c7b45f31ce1c6781495d1d61494c5 /ext | |
| parent | a1dcd5e0bdcfb2b1884ae15b26725531c5cc9f0a (diff) | |
| download | ruby-9bd337c8fd9f6a345e74b84515ecb40301e9f32f.tar.gz ruby-9bd337c8fd9f6a345e74b84515ecb40301e9f32f.tar.xz ruby-9bd337c8fd9f6a345e74b84515ecb40301e9f32f.zip | |
* ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
$srcs are always Array or nil now.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index ddbe49517..509c93e46 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -105,8 +105,8 @@ def extmake(target) $mdir = target $srcdir = File.join($top_srcdir, "ext", $mdir) $preload = nil - $objs = "" - $srcs = "" + $objs = [] + $srcs = [] $compiled[target] = false makefile = "./Makefile" ok = File.exist?(makefile) @@ -137,9 +137,8 @@ def extmake(target) } begin $extconf_h = nil - $objs = [] ok &&= extract_makefile(makefile) - old_objs = $objs + 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)) || @@ -180,7 +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) + FileUtils.rm_f($objs - old_objs) unless system($make, *args) $ignore or $continue or return false end |