diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-26 00:05:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-26 00:05:23 +0000 |
| commit | c923dcfde6e90e99d70aa9e3ed772da1d2f50c29 (patch) | |
| tree | 6d5214b04dfceb7e982c77cf61ba6a54967e3eb2 | |
| parent | 7ffba2e0287394c7f2d86d197b2dc8d6a0a7f793 (diff) | |
| download | ruby-c923dcfde6e90e99d70aa9e3ed772da1d2f50c29.tar.gz ruby-c923dcfde6e90e99d70aa9e3ed772da1d2f50c29.tar.xz ruby-c923dcfde6e90e99d70aa9e3ed772da1d2f50c29.zip | |
* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -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 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 $(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> * lib/mkmf.rb (pkg_config): particular config commands support. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 7ad7594c0..26c40ed58 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']} CXX = #{CONFIG['CXX']} |