diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-28 12:22:47 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-28 12:22:47 +0000 |
| commit | 082a2716cc0e95f37ac9b64c26f9d55d2b0cb499 (patch) | |
| tree | cd9649cfc1054ddb358f5ec8b7c1a481aefe16ec | |
| parent | d8da0faf236052d7e16c08bcb31c2d32d661a266 (diff) | |
extconf.rb: mingw32
* ext/psych/extconf.rb: mingw32 also needs macros for win32, not
only mswin32.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/psych/extconf.rb | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,4 +1,7 @@ -Wed Nov 28 21:21:16 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> +Wed Nov 28 21:22:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/psych/extconf.rb: mingw32 also needs macros for win32, not + only mswin32. * ext/psych/extconf.rb: compile sources in the source directory without copying by using VPATH. diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb index c545a9de77..bba3ab2c63 100644 --- a/ext/psych/extconf.rb +++ b/ext/psych/extconf.rb @@ -1,3 +1,4 @@ +# -*- coding: us-ascii -*- require 'mkmf' require 'fileutils' @@ -13,8 +14,8 @@ unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version') $srcs = Dir.glob("#{$srcdir}/{,yaml/}*.c").map {|n| File.basename(n)} - if $mswin - $CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H" + if have_macro("_WIN32") + $CPPFLAGS << " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H" end have_header 'dlfcn.h' |