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

Merged
merged 1 commit into from Jun 13, 2014

Conversation

Projects
None yet
4 participants
Contributor

zenspider commented Jun 13, 2014

reviewed: @tenderlove

tenderlove added a commit that referenced this pull request Jun 13, 2014

Merge pull request #1115 from zenspider/osx-archflags
Fix for stock ruby 2.0.0 on osx 10.9. Fixes #1101.

@tenderlove tenderlove merged commit a177695 into sparklemotion:master Jun 13, 2014

1 check was pending

continuous-integration/travis-ci The Travis CI build is in progress
Details
@@ -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

knu Jul 21, 2014

Owner

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

Owner

flavorjones commented Jul 21, 2014

@zenspider Any thoughts on @knu's suggestion?

Owner

flavorjones commented Jul 21, 2014

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

Contributor

zenspider commented Jul 21, 2014

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.

Owner

flavorjones commented Jul 22, 2014

Agree, #1131 should fix this.

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