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.

Sign up for GitHub

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

Jump to bottom

Allow passing rustix_use_libc cfg using RUSTFLAGS #102353

Merged
merged 1 commit into from
Oct 2, 2022
Merged

Allow passing rustix_use_libc cfg using RUSTFLAGS #102353

merged 1 commit into from
Oct 2, 2022

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Sep 27, 2022

Before this would error with

error: unexpected `rustix_use_libc` as condition name
  |
  = note: `-D unexpected-cfgs` implied by `-D warnings`
  = help: was set with `--cfg` but isn't in the `--check-cfg` expected names

I'm setting rustix_use_libc when testing bootstrapping rustc with cg_clif as I'm disabling inline asm here.

@bjorn3
Allow passing rustix_use_libc cfg using RUSTFLAGS
d04ea0f 
Before this would error with

```
error: unexpected `rustix_use_libc` as condition name
  |
  = note: `-D unexpected-cfgs` implied by `-D warnings`
  = help: was set with `--cfg` but isn't in the `--check-cfg` expected names
```

I'm setting rustix_use_libc when testing bootstrapping rustc with cg_clif as I'm disabling inline asm here.
@bjorn3 bjorn3 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-cranelift Things relevant to the [future] cranelift backend labels Sep 27, 2022
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(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 Sep 27, 2022
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup

Seems OK.

@bors
Copy link
Contributor

bors commented Oct 1, 2022

📌 Commit d04ea0f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 Oct 1, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 2, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 2, 2022
@bors
Auto merge of rust-lang#102558 - matthiaskrgr:rollup-0odec1c, r=matth…
ab37a83 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#102195 (Improve the COPYRIGHT file)
 - rust-lang#102313 (Update docs so that deprecated method points to relevant method)
 - rust-lang#102353 (Allow passing rustix_use_libc cfg using RUSTFLAGS)
 - rust-lang#102405 (Remove a FIXME whose code got moved away in rust-lang#62883.)
 - rust-lang#102525 (rustdoc: remove orphaned link on array bracket)
 - rust-lang#102557 (fix issue with x.py setup running into explicit panic)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 20559c4 into rust-lang:master Oct 2, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 2, 2022
@bjorn3 bjorn3 deleted the allow_rustix_use_libc branch February 25, 2023 19:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-cranelift Things relevant to the [future] cranelift backend S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.66.0
Development

Successfully merging this pull request may close these issues.
5 participants
@bjorn3 @rust-highfive @Mark-Simulacrum @bors @rustbot