From 920f4d8f143d13232bc6f4163fedccdfed817b4c Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 26 May 2006 00:05:23 +0000 Subject: * lib/mkmf.rb (configuration): add $defs unless extconf.h was created. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 +++- lib/mkmf.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 589fef299..a0d94aedd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Fri May 26 08:40:03 2006 nobuyoshi nakada +Fri May 26 09:05:11 2006 nobuyoshi nakada * ruby.h, lib/mkmf.rb (create_header): clear command line options for macros moved to extconf.h. @@ -11,6 +11,8 @@ Fri May 26 08:40:03 2006 nobuyoshi nakada * {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added $(INCFLAGS). + * lib/mkmf.rb (configuration): add $defs unless extconf.h was created. + Thu May 25 01:52:07 2006 nobuyoshi nakada * lib/mkmf.rb (pkg_config): particular config commands support. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a0cb36fea..553c547dc 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -963,7 +963,7 @@ VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} else sep = "" end - extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : "" + extconf_h = $extconf_h ? "-DRUBY_EXTCONF_H=\\\"$(RUBY_EXTCONF_H)\\\" " : $defs.join(" ")<<" " mk << %{ CC = #{CONFIG['CC']} LIBRUBY = #{CONFIG['LIBRUBY']} -- cgit