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.

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

Check if the archive has already been added to avoid duplicates #62286

Merged
merged 1 commit into from
Jul 7, 2019

Conversation

petrhosek
Copy link
Contributor

This avoids adding archives multiple times, which results in duplicate
objects in the resulting rlib, leading to symbol collision and link
failures. This could happen when crate contains multiple link attributes
that all reference the same archive.

@rust-highfive
Copy link
Collaborator

r? @estebank

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2019
@petrhosek
Copy link
Contributor Author

cc @cramertj @tmandry

@cramertj
Copy link
Member

cramertj commented Jul 2, 2019

r=me with nits fixed.

@cramertj
Copy link
Member

cramertj commented Jul 2, 2019

r? @cramertj

@rust-highfive rust-highfive assigned cramertj and unassigned estebank Jul 2, 2019
@petrhosek petrhosek force-pushed the rustc-no-duplicate-archives branch 2 times, most recently from cfe2fe9 to 35c70e6 Compare July 2, 2019 05:57
src/librustc_codegen_llvm/back/archive.rs Outdated Show resolved Hide resolved
src/librustc_codegen_llvm/back/archive.rs Outdated Show resolved Hide resolved
This avoids adding archives multiple times, which results in duplicate
objects in the resulting rlib, leading to symbol collision and link
failures. This could happen when crate contains multiple link attributes
that all reference the same archive.
@petrhosek petrhosek force-pushed the rustc-no-duplicate-archives branch from 35c70e6 to 069c52f Compare July 2, 2019 07:43
@cramertj
Copy link
Member

cramertj commented Jul 2, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 2, 2019

📌 Commit 069c52f has been approved by cramertj

@bors bors 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 Jul 2, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 3, 2019
…es, r=cramertj

Check if the archive has already been added to avoid duplicates

This avoids adding archives multiple times, which results in duplicate
objects in the resulting rlib, leading to symbol collision and link
failures. This could happen when crate contains multiple link attributes
that all reference the same archive.
Centril added a commit to Centril/rust that referenced this pull request Jul 4, 2019
…es, r=cramertj

Check if the archive has already been added to avoid duplicates

This avoids adding archives multiple times, which results in duplicate
objects in the resulting rlib, leading to symbol collision and link
failures. This could happen when crate contains multiple link attributes
that all reference the same archive.
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 4, 2019
…es, r=cramertj

Check if the archive has already been added to avoid duplicates

This avoids adding archives multiple times, which results in duplicate
objects in the resulting rlib, leading to symbol collision and link
failures. This could happen when crate contains multiple link attributes
that all reference the same archive.
Keruspe added a commit to Keruspe/rust that referenced this pull request Jul 5, 2019
This was broken by rust-lang#62376
Since rust-lang#62286 is not in beta yet, we cannot remove those not(bootstrap)

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Centril added a commit to Centril/rust that referenced this pull request Jul 7, 2019
…es, r=cramertj

Check if the archive has already been added to avoid duplicates

This avoids adding archives multiple times, which results in duplicate
objects in the resulting rlib, leading to symbol collision and link
failures. This could happen when crate contains multiple link attributes
that all reference the same archive.
Centril added a commit to Centril/rust that referenced this pull request Jul 7, 2019
…es, r=cramertj

Check if the archive has already been added to avoid duplicates

This avoids adding archives multiple times, which results in duplicate
objects in the resulting rlib, leading to symbol collision and link
failures. This could happen when crate contains multiple link attributes
that all reference the same archive.
bors added a commit that referenced this pull request Jul 7, 2019
Rollup of 4 pull requests

Successful merges:

 - #61883 (`non_ascii_idents` lint (part of RFC 2457))
 - #62042 (Support stability and deprecation checking for all macros)
 - #62213 (rustdoc: set cfg(doctest) when collecting doctests)
 - #62286 (Check if the archive has already been added to avoid duplicates)

Failed merges:

r? @ghost
@bors bors merged commit 069c52f into rust-lang:master Jul 7, 2019
petrhosek added a commit to petrhosek/rust that referenced this pull request Jul 7, 2019
This was removed in 8a7dded, but since rust-lang#62286 hasn't yet made it into
beta, this is breaking the build with llvm-libunwind feature enabled.

Furthemore, restrict the link attribute to Fuchsia and Linux, matching
the logic in build.rs since llvm-libunwind feature isn't yet supported
on other systems.
Centril added a commit to Centril/rust that referenced this pull request Jul 8, 2019
Re-add bootstrap attribute to libunwind for llvm-libunwind feature

This was removed in 8a7dded, but since rust-lang#62286 hasn't yet made it into
beta, this is breaking the build with llvm-libunwind feature enabled.

Furthemore, restrict the link attribute to Fuchsia and Linux, matching
the logic in build.rs since llvm-libunwind feature isn't yet supported
on other systems.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: 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.

7 participants