-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
1 changed file
with
35 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs | ||
| index ac758c1..11abfac 100644 | ||
| --- a/compiler/rustc_llvm/build.rs | ||
| +++ b/compiler/rustc_llvm/build.rs | ||
| @@ -347,18 +347,18 @@ fn main() { | ||
|
|
||
| // C++ runtime library | ||
| if !target.contains("msvc") { | ||
| - if let Some(s) = llvm_static_stdcpp { | ||
| - assert!(!cxxflags.contains("stdlib=libc++")); | ||
| - let path = PathBuf::from(s); | ||
| - println!("cargo:rustc-link-search=native={}", path.parent().unwrap().display()); | ||
| - if target.contains("windows") { | ||
| - println!("cargo:rustc-link-lib=static:-bundle={}", stdcppname); | ||
| - } else { | ||
| - println!("cargo:rustc-link-lib=static={}", stdcppname); | ||
| - } | ||
| - } else if cxxflags.contains("stdlib=libc++") { | ||
| - println!("cargo:rustc-link-lib=c++"); | ||
| - } else { | ||
| + if let Some(_s) = llvm_static_stdcpp { | ||
| + // assert!(!cxxflags.contains("stdlib=libc++")); | ||
| + // let path = PathBuf::from(s); | ||
| + // println!("cargo:rustc-link-search=native={}", path.parent().unwrap().display()); | ||
| + // if target.contains("windows") { | ||
| + // println!("cargo:rustc-link-lib=static:-bundle={}", stdcppname); | ||
| + // } else { | ||
| + // println!("cargo:rustc-link-lib=static={}", stdcppname); | ||
| + // } | ||
| + //} else if cxxflags.contains("stdlib=libc++") { | ||
| + // println!("cargo:rustc-link-lib=c++"); | ||
| + //} else { | ||
| println!("cargo:rustc-link-lib={}", stdcppname); | ||
| } | ||
| } |