From 895517b5362fe0d8626df76f10819364be20bc32 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 31 Aug 2006 14:59:43 +0000
Subject: * lib/mkmf.rb (configuration): follow nil.to_s.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index b9f04c4f2..173c1981c 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1073,7 +1073,7 @@ LIBRUBYARG_SHARED = #$LIBRUBYARG_SHARED
 LIBRUBYARG_STATIC = #$LIBRUBYARG_STATIC
 
 RUBY_EXTCONF_H = #{$extconf_h}
-CFLAGS   = #{CONFIG['CCDLFLAGS'] unless $static} #$CFLAGS #$ARCH_FLAG
+CFLAGS   = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
 INCFLAGS = -I. #$INCFLAGS
 CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
 CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
@@ -1194,6 +1194,7 @@ def create_makefile(target, srcprefix = nil)
       deffile = "$(TARGET)-$(arch).def"
     end
   end
+  origdef ||= ''
 
   if $extmk and not $extconf_h
     create_header
@@ -1335,7 +1336,7 @@ site-install-rb: install-rb
   end
   mfile.print "\n\n"
   if makedef
-    mfile.print "$(DEFFILE): #{origdef || ''}\n"
+    mfile.print "$(DEFFILE): #{origdef}\n"
     mfile.print "\t$(RUBY) #{makedef} #{origdef} > $@\n\n"
   end
 
-- 
cgit