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 /lib | |
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 'lib')
-rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8af18379e..1afce2ae6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1591,9 +1591,8 @@ def create_makefile(target, srcprefix = nil) for i in $objs i.sub!(/\.o\z/, ".#{$OBJEXT}") end - $objs = $objs.join(" ") - target = nil if $objs == "" + target = nil if $objs.empty? if target and EXPORT_PREFIX if File.exist?(File.join(srcdir, target + '.def')) @@ -1642,7 +1641,7 @@ target_prefix = #{target_prefix} LOCAL_LIBS = #{$LOCAL_LIBS} LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} SRCS = #{srcs.collect(&File.method(:basename)).join(' ')} -OBJS = #{$objs} +OBJS = #{$objs.join(" ")} TARGET = #{target} DLLIB = #{dllib} EXTSTATIC = #{$static || ""} |