Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rollup of 5 pull requests #40758

Merged
merged 15 commits into from
Mar 23, 2017
Merged

Rollup of 5 pull requests #40758

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4cd28a7
On-demandify associated item retrieval
cramertj Mar 20, 2017
8e58d9e
Use Iterator::find in associated_item search
cramertj Mar 21, 2017
1f65610
ci/netbsd: use the "official" cross compiler
TimNN Mar 17, 2017
7ae7bf3
Switch to rust-lang-ci mirror URLs
alexcrichton Mar 17, 2017
ba90248
include compiler hash in wrapper scripts
TimNN Mar 19, 2017
43a51b7
link agains relocatable libstdc++
TimNN Mar 19, 2017
a8800bb
Fix doc error for ExactSizeIterator
manuel-rhdt Mar 21, 2017
85dbc65
Changed error message for ObjectSafetyViolation::SupertraitSelf
mandeep Mar 23, 2017
7d302d2
Changed E0038 error message in test to comply with new message
mandeep Mar 23, 2017
769b95d
Add diagnostic for incorrect `pub (restriction)`
estebank Mar 18, 2017
4e96242
Rollup merge of #40612 - TimNN:new-netbsd-cross, r=alexcrichton
frewsxcv Mar 23, 2017
640dbbd
Rollup merge of #40627 - estebank:pub-restricted, r=petrochenkov
frewsxcv Mar 23, 2017
2233c6d
Rollup merge of #40668 - cramertj:on-demandify-more, r=nikomatsakis
frewsxcv Mar 23, 2017
08134cf
Rollup merge of #40715 - manuel-rhdt:patch-1, r=brson
frewsxcv Mar 23, 2017
ea76c5e
Rollup merge of #40753 - mandeep:change-ObjectSafetyViolation-message…
frewsxcv Mar 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
link agains relocatable libstdc++
  • Loading branch information
@TimNN
TimNN committed Mar 21, 2017
commit 43a51b78b8c24f2bd40b20d1a082db1443075c19
9 changes: 7 additions & 2 deletions src/librustc_llvm/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,16 +233,21 @@ fn main() {
}
}

// OpenBSD has a particular C++ runtime library name
let llvm_static_stdcpp = env::var_os("LLVM_STATIC_STDCPP");

let stdcppname = if target.contains("openbsd") {
// OpenBSD has a particular C++ runtime library name
"estdc++"
} else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
// NetBSD uses a separate library when relocation is required
"stdc++_pic"
} else {
"stdc++"
};

// C++ runtime library
if !target.contains("msvc") {
if let Some(s) = env::var_os("LLVM_STATIC_STDCPP") {
if let Some(s) = llvm_static_stdcpp {
assert!(!cxxflags.contains("stdlib=libc++"));
let path = PathBuf::from(s);
println!("cargo:rustc-link-search=native={}",
Expand Down