From 33a9c4383c2aef475ce5e8e54c9ff12ae47181c3 Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Tue, 7 Feb 2017 12:15:31 +1100 Subject: [PATCH] Use -stdlib=libc++ on mac for stylo bindgen --- components/style/build_gecko.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs index fb464c1f7b2..d947323ced7 100644 --- a/components/style/build_gecko.rs +++ b/components/style/build_gecko.rs @@ -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