summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-03 07:25:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-03 07:25:50 +0000
commit2b3a2048328e23810283f83d23fa20a63242c0fe (patch)
tree6df99abb666c7b45f31ce1c6781495d1d61494c5 /lib
parent2a89c088a25ef0ff7b148a211160bc4894d7a9b2 (diff)
* ext/extmk.rb (extmake), lib/mkmf.rb (create_makefile): $objs and
$srcs are always Array or nil now. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/mkmf.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 8af18379e1..1afce2ae65 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 || ""}