Skip to content

Commit

Permalink
Fix platform detection for x64-mswin64
Browse files Browse the repository at this point in the history
  • Loading branch information
iwadon committed Mar 5, 2012
1 parent 1ce1581 commit 91d1f47
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ext/nokogiri/extconf.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
$CFLAGS << " #{ENV["CFLAGS"]}"
$LIBS << " #{ENV["LIBS"]}"

if RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin32/
if RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin/
$CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
elsif RbConfig::CONFIG['target_os'] =~ /solaris/
$CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
Expand All @@ -34,7 +34,7 @@
$CFLAGS << " -Wall -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline"
end

if RbConfig::CONFIG['target_os'] =~ /mswin32/
if RbConfig::CONFIG['target_os'] =~ /mswin/
lib_prefix = 'lib'

# There's no default include/lib dir on Windows. Let's just add the Ruby ones
Expand Down

0 comments on commit 91d1f47

Please sign in to comment.