diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-24 12:58:42 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-24 12:58:42 +0000 |
| commit | 0a331272e41201c5170ae64872bebb28c141f194 (patch) | |
| tree | c99777e908e584ebe5464882ee920688f880235b /ext | |
| parent | f81b064d7da630563ad1e3b046176df9a482fa90 (diff) | |
| download | ruby-0a331272e41201c5170ae64872bebb28c141f194.tar.gz ruby-0a331272e41201c5170ae64872bebb28c141f194.tar.xz ruby-0a331272e41201c5170ae64872bebb28c141f194.zip | |
* configure.in (LIBPATHFLAG): avoid $ substitution.
[ruby-dev:18577]
* ext/extmk.rb (extmake): expand $srcdir.
* ext/win32ole/extconf.rb: should not override $CFLAGS, but
append.
* lib/mkmf.rb (config_string): use given config hash.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb | 2 | ||||
| -rw-r--r-- | ext/win32ole/extconf.rb | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index c98afdf44..e43638326 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -50,7 +50,7 @@ def extmake(target) $srcdir = File.join($top_srcdir, "ext", $mdir) unless $ignore if $static || - older("./Makefile", *MTIMES + %w"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb") + older("./Makefile", *MTIMES + %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb") then $defs = [] Logging::logfile 'mkmf.log' diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb index f627fcabb..c0dfd4c72 100644 --- a/ext/win32ole/extconf.rb +++ b/ext/win32ole/extconf.rb @@ -17,10 +17,8 @@ end case RUBY_PLATFORM when /mswin32/ - $CFLAGS='/W3' -when /mingw/ - $CFLAGS='-DNONAMELESSUNION' -when /cygwin/ - $CFLAGS='-DNONAMELESSUNION' + $CFLAGS += ' /W3' +when /cygwin/, /mingw/ + $defs << '-DNONAMELESSUNION' end create_win32ole_makefile |