diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-25 23:44:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-05-25 23:44:08 +0000 |
| commit | 65937b5eb9e35cd4b76261ac7bb3b3c3809cbe38 (patch) | |
| tree | 5e2b99484f0b00685b8d05c07e88a3a56ff483e6 /ext/zlib | |
| parent | 155c33c1d164987a5f872e410c506187f26869fd (diff) | |
* ruby.h, lib/mkmf.rb (create_header): clear command line options for
macros moved to extconf.h.
* ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
EXTSTATIC permanent.
* ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.
* {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
$(INCFLAGS).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/zlib')
| -rw-r--r-- | ext/zlib/extconf.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb index 6b9bb05742..b4e76af3c6 100644 --- a/ext/zlib/extconf.rb +++ b/ext/zlib/extconf.rb @@ -54,12 +54,7 @@ if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and message "#{OS_NAMES[os_code]}\n" defines << "OS_CODE=#{os_code}" - defines = defines.collect{|d|' -D'+d}.join - if $CPPFLAGS then - $CPPFLAGS += defines - else - $CFLAGS += defines - end + $defs.concat(defines.collect{|d|' -D'+d}) create_makefile('zlib') |