Skip to content

Include libunwind in the rust-src component. - #77086

Merged
bors merged 1 commit into
rust-lang:masterfrom
ehuss:src-libunwind
Sep 25, 2020
Merged

Include libunwind in the rust-src component.#77086
bors merged 1 commit into
rust-lang:masterfrom
ehuss:src-libunwind

Conversation

@ehuss

Copy link
Copy Markdown
Contributor

Some targets, such as musl, need the libunwind source to build the unwind crate (referenced here).

Fixesrust-lang/wg-cargo-std-aware#59

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @Mark-Simulacrum

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 23, 2020
@Mark-Simulacrum

Copy link
Copy Markdown
Member

Hm, this is actually a bit concerning from a licensing perspective - libunwind appears to be Apache with LLVM exception, but we claim MIT or APACHE 2.0.

Maybe we're okay because of the exception?

Cc @joshtriplett

r=me on the change itself, but I'll want to file an issue at least, will do so tomorrow (or feel free to do so, and approve)

@ehuss

Copy link
Copy Markdown
ContributorAuthor

I was under the impression that libunwind was MIT OR BSD-Like. I also thought that these licenses for the runtime are ok (per LICENSES).

Also, I don't think the license for rust-src is clearly specified anywhere (you can unpack it, but the licenses are kinda random). IANAL, so I have no idea if that's even necessary to embed in a file like that.

As for the general license instructions for the standard library, I thought #67014 was the issue for that. Or are you referring to something else?

@Mark-Simulacrum

Copy link
Copy Markdown
Member

#67014 seems sufficient for now. I don't think anything in the explicitly allowed list obviously matches my impression of LLVM licensing, but I am also not a lawyer :)

@bors r+ for now, though, doesn't seem like blocking this patch changes status quo anyway.

@bors

bors commented Sep 23, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 9f27f37 has been approved by Mark-Simulacrum

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 23, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 24, 2020
Include libunwind in the rust-src component.
Some targets, such as musl, need the libunwind source to build the unwind crate (referenced [here](https://github.com/rust-lang/rust/blob/0da58007451a154da2480160429e1604a1f5f0ec/library/unwind/build.rs#L142)).
Fixesrust-lang/wg-cargo-std-aware#59
@joshtriplett

joshtriplett commented Sep 24, 2020

Copy link
Copy Markdown
Member

I don't think there's any issue here. libunwind, as pointed out in an earlier comment, has a more permissive license than the rest of LLVM.

(Also, in general I don't think there'd be an issue if we wanted to include things under LLVM's normal license of Apache-2.0 WITH LLVM-exception.)

@RalfJung

Copy link
Copy Markdown
Member

@bors rollup

RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 25, 2020
Include libunwind in the rust-src component.
Some targets, such as musl, need the libunwind source to build the unwind crate (referenced [here](https://github.com/rust-lang/rust/blob/0da58007451a154da2480160429e1604a1f5f0ec/library/unwind/build.rs#L142)).
Fixesrust-lang/wg-cargo-std-aware#59
@RalfJungRalfJung mentioned this pull request Sep 25, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 25, 2020
Include libunwind in the rust-src component.
Some targets, such as musl, need the libunwind source to build the unwind crate (referenced [here](https://github.com/rust-lang/rust/blob/0da58007451a154da2480160429e1604a1f5f0ec/library/unwind/build.rs#L142)).
Fixesrust-lang/wg-cargo-std-aware#59
@RalfJungRalfJung mentioned this pull request Sep 25, 2020
This was referenced Sep 25, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 25, 2020
…as-schievink
Rollup of 15 pull requests
Successful merges:
- rust-lang#76932 (Relax promises about condition variable.)
- rust-lang#76973 (Unstably allow assume intrinsic in const contexts)
- rust-lang#77005 (BtreeMap: refactoring around edges)
- rust-lang#77066 (Fix dest prop miscompilation around references)
- rust-lang#77073 (dead_code: look at trait impls even if they don't contain items)
- rust-lang#77086 (Include libunwind in the rust-src component.)
- rust-lang#77097 (Make [].as_[mut_]ptr_range() (unstably) const.)
- rust-lang#77106 (clarify that `changelog-seen = 1` goes to the beginning of config.toml)
- rust-lang#77120 (Add `--keep-stage-std` to `x.py` for keeping only standard library artifacts)
- rust-lang#77126 (Invalidate local LLVM cache less often)
- rust-lang#77146 (Install std for non-host targets)
- rust-lang#77155 (remove enum name from ImplSource variants)
- rust-lang#77176 (Removing erroneous semicolon in transmute documentation)
- rust-lang#77183 (Allow multiple allow_internal_unstable attributes)
- rust-lang#77189 (Remove extra space from vec drawing)
Failed merges:
r? `@ghost`
@bors
bors merged commit b49990c into rust-lang:masterSep 25, 2020
@rustbotrustbot added this to the 1.48.0 milestone Sep 25, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Can't build executables for musl

8 participants

@ehuss@rust-highfive@Mark-Simulacrum@bors@joshtriplett@RalfJung@alexcrichton@rustbot