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

Fix CARGO_TARGET_triple_LINKER environment variable. #7763

Merged
merged 1 commit into from Jan 6, 2020

Conversation

@ehuss
Copy link
Contributor

ehuss commented Jan 2, 2020

#7649 caused an unfortunate regression where the CARGO_TARGET_triple_LINKER environment variable stopped working. I did not realize serde(flatten) caused serde to switch to deserialize_map which does not support environment variables.

The solution here is to essentially revert back to how the [target] table used to be loaded by loading each key individually.

This also removes the ar field which is not used by rustc.

@rust-highfive

This comment has been minimized.

Copy link

rust-highfive commented Jan 2, 2020

r? @alexcrichton

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

@ehuss ehuss force-pushed the ehuss:fix-target-cfg-env branch from 6e108c2 to 35b924d Jan 2, 2020
@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Jan 6, 2020

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 6, 2020

📌 Commit 35b924d has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 6, 2020

⌛️ Testing commit 35b924d with merge 5cca88f...

bors added a commit that referenced this pull request Jan 6, 2020
Fix CARGO_TARGET_triple_LINKER environment variable.

#7649 caused an unfortunate regression where the `CARGO_TARGET_triple_LINKER` environment variable stopped working. I did not realize `serde(flatten)` caused serde to switch to `deserialize_map` which does not support environment variables.

The solution here is to essentially revert back to how the `[target]` table used to be loaded by loading each key individually.

This also removes the `ar` field which is not used by `rustc`.
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 6, 2020

☀️ Test successful - checks-azure
Approved by: alexcrichton
Pushing 5cca88f to master...

@bors bors merged commit 35b924d into rust-lang:master Jan 6, 2020
11 checks passed
11 checks passed
homu Test successful
Details
rust-lang.cargo Build #20200102.6 succeeded
Details
rust-lang.cargo (Linux beta) Linux beta succeeded
Details
rust-lang.cargo (Linux nightly) Linux nightly succeeded
Details
rust-lang.cargo (Linux stable) Linux stable succeeded
Details
rust-lang.cargo (Windows x86_64-msvc) Windows x86_64-msvc succeeded
Details
rust-lang.cargo (build_std) build_std succeeded
Details
rust-lang.cargo (docs) docs succeeded
Details
rust-lang.cargo (macOS) macOS succeeded
Details
rust-lang.cargo (resolver) resolver succeeded
Details
rust-lang.cargo (rustfmt) rustfmt succeeded
Details
@ehuss ehuss mentioned this pull request Jan 7, 2020
bors added a commit to rust-lang/rust that referenced this pull request Jan 7, 2020
Update cargo

9 commits in 86134e7666a088682f20b76278c3ee096a315218..6e1ca924a67dd1ac89c33f294ef26b5c43b89168
2019-12-23 16:08:07 +0000 to 2020-01-06 19:11:37 +0000
- Fix dynamic linking for Windows UWP MSVC targets (rust-lang/cargo#7758)
- Fix CARGO_TARGET_triple_LINKER environment variable. (rust-lang/cargo#7763)
- Remove metadata dep_kinds duplicates. (rust-lang/cargo#7756)
- Check for a source defined multiple times. (rust-lang/cargo#7751)
- Fix typo. (rust-lang/cargo#7735)
- Fix config env vars that are prefix of another with underscore. (rust-lang/cargo#7748)
- Add test for `cargo pkgid` (rust-lang/cargo#7741)
- Add a note to the error message for using --feature / --no-default-features in a virtual workspace (rust-lang/cargo#7742)
- Fix debug message. (rust-lang/cargo#7749)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.