Skip to content

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented Sep 4, 2018

This is the other part of #53377 that was missed in the #53880 backport.

r? @pietroalbini

The former code used `target.contains("64")` to detect Elf64 targets,
but this is inaccurate in a few cases:

- `s390x-unknown-linux-gnu` is 64-bit
- `sparcv9-sun-solaris` is 64-bit
- `x86_64-unknown-linux-gnux32` is 32-bit

Instead the `std` build script can use `CARGO_CFG_TARGET_POINTER_WIDTH`
to reliably detect 64-bit targets for libbacktrace.

Also update to backtrace-sys 0.1.24 for rust-lang/backtrace-rs#122.
@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 4, 2018
@pietroalbini
Copy link
Member

@bors r+ p=1 (beta backport)

@bors
Copy link
Collaborator

bors commented Sep 4, 2018

📌 Commit e9dce13 has been approved by pietroalbini

@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 Sep 4, 2018
@bors
Copy link
Collaborator

bors commented Sep 4, 2018

⌛ Testing commit e9dce13 with merge 94a96e2...

bors added a commit that referenced this pull request Sep 4, 2018
[beta] update backtrace-sys to 0.1.24

This is the other part of #53377 that was missed in the #53880 backport.

r? @pietroalbini
@bors
Copy link
Collaborator

bors commented Sep 4, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: pietroalbini
Pushing 94a96e2 to beta...

@bors bors merged commit e9dce13 into rust-lang:beta Sep 4, 2018
@cuviper cuviper deleted the beta-backtrace-sys branch May 17, 2019 21:50
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.

4 participants