Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix for stock ruby 2.0.0 on osx 10.9. Fixes #1101. #1115

Merged
merged 1 commit into from

4 participants

@tenderlove tenderlove merged commit a177695 into sparklemotion:master
@knu knu commented on the diff
ext/nokogiri/extconf.rb
@@ -311,6 +311,9 @@ def patch
$CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
when /solaris/
$CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
+when /darwin/
+ # TODO: maybe make it stricter to only work on stock ruby? How to tell?
+ $CFLAGS << " -Wno-error=unused-command-line-argument-hard-error-in-future"
@knu Owner
knu added a note

I think this should be guarded with an "if the_compiler_is_clang?" block.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@flavorjones
Owner

@zenspider Any thoughts on @knu's suggestion?

@flavorjones
Owner

I'm inclined to revert this change given #1130.

@zenspider

I'd suggest we amend it. You're gonna piss off one half or the other if we don't come up with something that works for both gcc and clang.

Suggestions on how to figure out what compiler is actually being used would be appreciated. Just doing a regex against CC feels incomplete. But if it is what we have, then we do that.

@flavorjones
Owner

Agree, #1131 should fix this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 13, 2014
  1. @zenspider
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 0 deletions.
  1. +3 −0  ext/nokogiri/extconf.rb
View
3  ext/nokogiri/extconf.rb
@@ -311,6 +311,9 @@ def patch
$CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
when /solaris/
$CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
+when /darwin/
+ # TODO: maybe make it stricter to only work on stock ruby? How to tell?
+ $CFLAGS << " -Wno-error=unused-command-line-argument-hard-error-in-future"
@knu Owner
knu added a note

I think this should be guarded with an "if the_compiler_is_clang?" block.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
else
$CFLAGS << " -g -DXP_UNIX"
end
Something went wrong with that request. Please try again.