Skip to content

Commit

Permalink
Merge pull request #1131 from zenspider/gcc-vs-clang
Browse files Browse the repository at this point in the history
- Guard darwin CFLAGS against GCC.
  • Loading branch information
flavorjones committed Jul 21, 2014
2 parents 8f22560 + c18f79d commit ec43ab6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ext/nokogiri/extconf.rb
Expand Up @@ -312,8 +312,9 @@ def patch
when /solaris/ when /solaris/
$CFLAGS << " -DUSE_INCLUDED_VASPRINTF" $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
when /darwin/ when /darwin/
# TODO: maybe make it stricter to only work on stock ruby? How to tell? if RbConfig::MAKEFILE_CONFIG['CC'] !~ /gcc/ then
$CFLAGS << " -Wno-error=unused-command-line-argument-hard-error-in-future" $CFLAGS << " -Wno-error=unused-command-line-argument-hard-error-in-future"
end
else else
$CFLAGS << " -g -DXP_UNIX" $CFLAGS << " -g -DXP_UNIX"
end end
Expand Down

0 comments on commit ec43ab6

Please sign in to comment.