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 | 399aed89724ecb3aebd0f46aeb8c98a6bdf5c47d (patch) | |
| tree | 8045778cbad3bc3e41c846074f4a7db239ce5e47 /lib | |
| parent | 64603725aa485e14b0a06fbfc94c11f0b0d42de6 (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/branches/ruby_1_8@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 6a70565dde..10bc40a993 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1466,9 +1466,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')) @@ -1507,7 +1506,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 || ""} |
