diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2017-01-19 17:18:12 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2017-01-20 13:49:16 -0800 |
| commit | 72c3148bb34fe7365d33f78bd732385ab091f3cb (patch) | |
| tree | 5d71b9723dfe3c6b6e9bfe20737b0d7f59b321b7 /src/bootstrap | |
| parent | 5e8d7a4b7c2bfa3c278b93c0a81e151357f9b819 (diff) | |
| download | rust-72c3148bb34fe7365d33f78bd732385ab091f3cb.tar.gz rust-72c3148bb34fe7365d33f78bd732385ab091f3cb.zip | |
More test fixes from rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/compile.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 0eeb799672c..079f93e7331 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -213,7 +213,11 @@ pub fn rustc(build: &Build, target: &str, compiler: &Compiler) { if let Some(s) = target_config.and_then(|c| c.llvm_config.as_ref()) { cargo.env("CFG_LLVM_ROOT", s); } - if build.config.llvm_static_stdcpp { + // Building with a static libstdc++ is only supported on linux right now, + // not for MSVC or OSX + if build.config.llvm_static_stdcpp && + !target.contains("windows") && + !target.contains("apple") { cargo.env("LLVM_STATIC_STDCPP", compiler_file(build.cxx(target), "libstdc++.a")); } |