Auto merge of #15414 - upsuper:macos-libcxx, r=emilio

Use -stdlib=libc++ on mac for stylo bindgen

r? @emilio

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15414)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-06 17:18:22 -08:00 committed by GitHub
commit a1d19ca5f8

View file

@ -138,7 +138,12 @@ mod bindings {
if cfg!(target_os = "linux") {
builder = builder.clang_arg("-DOS_LINUX=1");
} else if cfg!(target_os = "macos") {
builder = builder.clang_arg("-DOS_MACOSX=1");
builder = builder.clang_arg("-DOS_MACOSX=1")
.clang_arg("-stdlib=libc++")
// To disable the fixup bindgen applies which adds search
// paths from clang command line in order to avoid potential
// conflict with -stdlib=libc++.
.clang_arg("--target=x86_64-apple-darwin");
} else if cfg!(target_env = "msvc") {
builder = builder.clang_arg("-DOS_WIN=1").clang_arg("-DWIN32=1")
// For compatibility with MSVC 2015