Skip to content

Rollup of 3 pull requests - #75654

Merged
bors merged 6 commits into
rust-lang:masterfrom
tmandry:rollup-ej0oezi
Aug 18, 2020
Merged

Rollup of 3 pull requests#75654
bors merged 6 commits into
rust-lang:masterfrom
tmandry:rollup-ej0oezi

Conversation

@tmandry

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost

mati865and others added 6 commits August 16, 2020 21:56
Make sure to test for file types against the non-canonicalized name
to avoid detecting the wrong type. Some systems save build artifacts
into associative file stores that do not preserve extensions, and
then link to those using conventionally-named symbolic links that
are the arguments to `rustc` et al. If we canonicalize before
testing the type, we resolve the symlink, the extension is lost and
we might treat rlibs and rmetas as dylibs.
The fix is to introduce a temporary to hold the canonicalized name,
compare against the non-canonical name, and add a comment
explaining what's going on for the would-be maintainer who sees a
potential cleanup.
Signed-off-by: Dan Cross <dcross@google.com>
librustc_metadata::locator: Properly detect file type.
Make sure to test file types against the non-canonicalized name to
avoid detecting the wrong type. Some systems save build artifacts
into associate file stores that do not preserve extensions, and
then link to those using conventionally-named symbolic links, that
are the arguments to `rustc` et al. If we canonicalize before
testing the type, we resolve the symlink, the extension is
lost and we might treat rlibs and rmetas as dylibs.
The fix is to tntroduce a temporary to hold the canonicalized name,
compare against the non-canonical name, and add a comment
explaining what's going on for the would-be mainter who sees a
potential cleanup.
Signed-off-by: Dan Cross <dcross@google.com>
…oli-obk
Use more compatible out-implib style
When calling `rust-lld` directly it accepts only `--out-implib {}` or `--out-implib={}` not `--out-implib,{}`.
…crum
update stacker to 0.1.11 to unbreak build for wasm32-unknown-unknown
Like rust-lang#72079, this updates stacker. The related problem is stacker is here rust-lang/stacker#42. It was fixed by switching from `libc::c_void` to `std::ffi::c_void` https://github.com/rust-lang/stacker/pull/43/files.
@tmandry

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=3 rollup=never
@rustbot modify labels: +rollup

@bors

bors commented Aug 18, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 14c0e4c has been approved by tmandry

@rustbotrustbot added the rollup A PR which is a rollup label Aug 18, 2020
@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 18, 2020
@bors

bors commented Aug 18, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 14c0e4c with merge b97e9b5...

@bors

bors commented Aug 18, 2020

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions, checks-azure
Approved by: tmandry
Pushing b97e9b5 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Aug 18, 2020
@bors
bors merged commit b97e9b5 into rust-lang:masterAug 18, 2020
@tmandry
tmandry deleted the rollup-ej0oezi branch August 18, 2020 17:34
@cuvipercuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-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.

6 participants

@tmandry@bors@cuviper@rustbot@mati865@ctaggart