diff options
| author | bors <bors@rust-lang.org> | 2024-04-05 22:12:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-05 22:12:43 +0000 |
| commit | 11853ecd86c10dcc8b10d2bbf737fbf9bffe27bc (patch) | |
| tree | 74cbdf5b014e99d96e3f561ed1dd4374648bfb7c /src/tools | |
| parent | 9d79cd5f79e75bd0d2083260271307ce9acd9081 (diff) | |
| parent | a074d278d30df4d4a3d6cd55117e6fdddfc9dd25 (diff) | |
| download | rust-11853ecd86c10dcc8b10d2bbf737fbf9bffe27bc.tar.gz rust-11853ecd86c10dcc8b10d2bbf737fbf9bffe27bc.zip | |
Auto merge of #123517 - GuillaumeGomez:rollup-eys3jfp, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #121419 (Add aarch64-apple-visionos and aarch64-apple-visionos-sim tier 3 targets) - #123159 (Fix target-cpu fpu features on Arm R/M-profile) - #123487 (CFI: Restore typeid_for_instance default behavior) - #123500 (Revert removing miri jobserver workaround) - #123505 (Revert "Use OS thread name by default") - #123509 (Add jieyouxu to compiler review rotation and as a reviewer for `tests/run-make`, `src/tools/run-make-support` and `src/tools/compiletest`) - #123514 (Fix typo in `compiler/rustc_middle/src/traits/solve/inspect.rs`) - #123515 (Use `include` command to reduce code duplication) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/compiletest/src/raise_fd_limit.rs | 2 | ||||
| -rw-r--r-- | src/tools/miri/cargo-miri/src/phases.rs | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/tools/compiletest/src/raise_fd_limit.rs b/src/tools/compiletest/src/raise_fd_limit.rs index bc2946e2c13..a4235381beb 100644 --- a/src/tools/compiletest/src/raise_fd_limit.rs +++ b/src/tools/compiletest/src/raise_fd_limit.rs @@ -4,7 +4,7 @@ /// on the number of cores available. /// /// This fixes issue #7772. -#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos"))] +#[cfg(any(target_os = "macos", target_os = "ios", target_os = "watchos", target_os = "visionos"))] #[allow(non_camel_case_types)] pub unsafe fn raise_fd_limit() { use std::cmp; diff --git a/src/tools/miri/cargo-miri/src/phases.rs b/src/tools/miri/cargo-miri/src/phases.rs index efa3fb0c77d..3f6c484a057 100644 --- a/src/tools/miri/cargo-miri/src/phases.rs +++ b/src/tools/miri/cargo-miri/src/phases.rs @@ -558,6 +558,13 @@ pub fn phase_runner(mut binary_args: impl Iterator<Item = String>, phase: Runner // Set missing env vars. We prefer build-time env vars over run-time ones; see // <https://github.com/rust-lang/miri/issues/1661> for the kind of issue that fixes. for (name, val) in info.env { + // `CARGO_MAKEFLAGS` contains information about how to reach the jobserver, but by the time + // the program is being run, that jobserver no longer exists (cargo only runs the jobserver + // for the build portion of `cargo run`/`cargo test`). Hence we shouldn't forward this. + // Also see <https://github.com/rust-lang/rust/pull/113730>. + if name == "CARGO_MAKEFLAGS" { + continue; + } if let Some(old_val) = env::var_os(&name) { if old_val == val { // This one did not actually change, no need to re-set it. |