1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (configuration): follow nil.to_s.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-08-31 14:59:43 +00:00
parent 974037a542
commit 079ec46b4b
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Aug 31 23:59:03 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration): follow nil.to_s.
Thu Aug 31 20:50:46 2006 NAKAMURA Usaku <usa@ruby-lang.org> Thu Aug 31 20:50:46 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (create_makefile): follow nil.to_s. * lib/mkmf.rb (create_makefile): follow nil.to_s.

5
lib/mkmf.rb
View File

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