8000 Rollup of 7 pull requests by m-ou-se · Pull Request #88618 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Rollup of 7 pull requests #88618

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

Merged
merged 17 commits into from
Sep 3, 2021
Merged

Rollup of 7 pull requests #88618

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
003a636
Add an example for deriving PartialOrd on enums
azdavis Aug 21, 2021
446c429
Fix LLVM libunwind build for non-musl targets
Aug 30, 2021
8cecac2
Add test case for using `slice::fill` with MaybeUninit
atsuzaki Aug 30, 2021
5390ea4
Move to the top of file
atsuzaki Aug 31, 2021
fc2a265
cleanup const generics FIXME
lcnr Sep 1, 2021
7207194
update FIXME
lcnr Sep 1, 2021
d18ff40
use the correct feature gate
lcnr Sep 1, 2021
9da8e2a
remove redundant / misplaced sentence from docs
ast-ral Sep 2, 2021
5ea45f3
Update outdated docs of array::IntoIter::new.
m-ou-se Sep 3, 2021
00c8da1
Update primitive docs for rust 2021.
m-ou-se Sep 3, 2021
cb2be32
Rollup merge of #88202 - azdavis:master, r=jyn514
m-ou-se Sep 3, 2021
3ce205a
Rollup merge of #88483 - jethrogb:jb/llvm-libunwind-self-contained, r…
m-ou-se Sep 3, 2021
80b572b
Rollup merge of #88507 - atsuzaki:slice-fill-maybeuninit-test, r=Ralf…
m-ou-se Sep 3, 2021
4b5da4a
Rollup merge of #88557 - lcnr:const-generics-cleanup, r=BoxyUwU
m-ou-se Sep 3, 2021
01775b6
Rollup merge of #88579 - ast-ral:master, r=m-ou-se
m-ou-se Sep 3, 2021
e13b9c9
Rollup merge of #88610 - m-ou-se:array-into-iter-docs, r=Amanieu
m-ou-se Sep 3, 2021
2ce74b0
Rollup merge of #88613 - m-ou-se:array-docs-2021, r=Amanieu
m-ou-se Sep 3, 2021
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
Fix LLVM libunwind build for non-musl targets 
Broken in #85600
  • Loading branch information
Jethro Beekman committed Aug 30, 2021
commit 446c42945d7518e848ba9b9f7c844d6b3cc7b892
32 changes: 20 additions & 12 deletions src/bootstrap/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,14 @@ fn copy_and_stamp(
target_deps.push((target, dependency_type));
}

fn copy_llvm_libunwind(builder: &Builder<'_>, target: TargetSelection, libdir: &Path) -> PathBuf {
let libunwind_path = builder.ensure(native::Libunwind { target });
let libunwind_source = libunwind_path.join("libunwind.a");
let libunwind_target = libdir.join("libunwind.a");
builder.copy(&libunwind_source, &libunwind_target);
libunwind_target
}

/// Copies third party objects needed by various targets.
fn copy_third_party_objects(
builder: &Builder<'_>,
Expand All @@ -167,6 +175,15 @@ fn copy_third_party_objects(
);
}

if target == "x86_64-fortanix-unknown-sgx"
|| builder.config.llvm_libunwind == LlvmLibunwind::InTree
&& (target.contains("linux") || target.contains("fuchsia"))
{
let libunwind_path =
copy_llvm_libunwind(builder, target, &builder.sysroot_libdir(*compiler, target));
target_deps.push((libunwind_path, DependencyType::Target));
}

target_deps
}

Expand Down Expand Up @@ -208,6 +225,9 @@ fn copy_self_contained_objects(
builder.copy(&src, &target);
target_deps.push((target, DependencyType::TargetSelfContained));
}

let libunwind_path = copy_llvm_libunwind(builder, target, &libdir_self_contained);
target_deps.push((libunwind_path, DependencyType::TargetSelfContained));
} else if target.ends_with("-wasi") {
let srcdir = builder
.wasi_root(target)
Expand All @@ -234,18 +254,6 @@ fn copy_self_contained_objects(
}
}

if target.contains("musl")
|| target.contains("x86_64-fortanix-unknown-sgx")
|| builder.config.llvm_libunwind == LlvmLibunwind::InTree
&& (target.contains("linux") || target.contains("fuchsia"))
{
let libunwind_path = builder.ensure(native::Libunwind { target });
let libunwind_source = libunwind_path.join("libunwind.a");
let libunwind_target = libdir_self_contained.join("libunwind.a");
builder.copy(&libunwind_source, &libunwind_target);
target_deps.push((libunwind_target, DependencyType::TargetSelfContained));
}

target_deps
}

Expand Down
0