diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-03 06:34:13 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-03 06:34:13 +0000 |
| commit | 0dbe4950441278ecb65a2da5b8cadb652ca48f7f (patch) | |
| tree | 61077fea582d05d3b33a346eaf7562898394c136 /lib/mkmf.rb | |
| parent | 94bfd049fdb8b499ead7451b029f6b33a5aa9e84 (diff) | |
| download | ruby-0dbe4950441278ecb65a2da5b8cadb652ca48f7f.tar.gz | |
* lib/mkmf.rb: get rid of nil.to_s.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 173c1981c2..a09d8d7cab 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -536,7 +536,7 @@ end def checking_for(m, fmt = nil) f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim - m = "checking #{'for ' if /\Acheck/ !~ f}#{m}... " + m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... " message "%s", m a = r = nil Logging::postpone do @@ -1099,7 +1099,7 @@ COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'} #### End of system configuration section. #### -preload = #{$preload.join(" ") if $preload} +preload = #{$preload ? $preload.join(' ') : ''} } if $nmake == ?b mk.each do |x| @@ -1456,7 +1456,7 @@ MESSAGE def mkmf_failed(path) unless $makefile_created or File.exist?("Makefile") - opts = $arg_config.collect {|t, n| "\t#{t}#{"=#{n}" if n}\n"} + opts = $arg_config.collect {|t, n| "\t#{t}#{n ? "=#{n}" : ""}\n"} abort "*** #{path} failed ***\n" + FailedMessage + opts.join end end @@ -1502,7 +1502,7 @@ end config_string('COMMON_HEADERS') do |s| Shellwords.shellwords(s).each {|s| hdr << "#include <#{s}>"} end -COMMON_HEADERS = if hdr.empty? then "" else hdr.join("\n") end +COMMON_HEADERS = hdr.join("\n") COMMON_LIBS = config_string('COMMON_LIBS', &split) || [] COMPILE_RULES = config_string('COMPILE_RULES', &split) || %w[.%s.%s:] |