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

* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2006-05-26 00:05:23 +00:00
parent b9287e46ab
commit 3449f576f4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,4 @@
Fri May 26 08:40:03 2006 nobuyoshi nakada <nobu@ruby-lang.org> Fri May 26 09:05:11 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* ruby.h, lib/mkmf.rb (create_header): clear command line options for * ruby.h, lib/mkmf.rb (create_header): clear command line options for
macros moved to extconf.h. macros moved to extconf.h.
@ -11,6 +11,8 @@ Fri May 26 08:40:03 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added * {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
$(INCFLAGS). $(INCFLAGS).
* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
Thu May 25 01:52:07 2006 nobuyoshi nakada <nobu@ruby-lang.org> Thu May 25 01:52:07 2006 nobuyoshi nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (pkg_config): particular config commands support. * lib/mkmf.rb (pkg_config): particular config commands support.

2
lib/mkmf.rb
View File

@ -963,7 +963,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
else else
sep = "" sep = ""
end end
extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : "" extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ")<<" "
mk << %{ mk << %{
CC = #{CONFIG['CC']} CC = #{CONFIG['CC']}
CXX = #{CONFIG['CXX']} CXX = #{CONFIG['CXX']}