diff options
| author | bors <bors@rust-lang.org> | 2024-09-30 23:23:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-30 23:23:40 +0000 |
| commit | c87004a1f5be671e3f03f69fb13d8915bdbb6a52 (patch) | |
| tree | 2d86795a8614bdfb1d64a2f3281d61669dad0d5a /src/bootstrap | |
| parent | fb4aebddd18d258046ddb51fd41589295259a0fa (diff) | |
| parent | a0637597b4fd169118bc794363474ef4d5d06e1d (diff) | |
Auto merge of #131078 - tgross35:rollup-66to2u9, r=tgross35
Rollup of 5 pull requests Successful merges: - #129638 (Hook up std::net to wasi-libc on wasm32-wasip2 target) - #130877 (rustc_target: Add RISC-V atomic-related features) - #130914 (Mark some more types as having insignificant dtor) - #130961 (Enable `f16` tests on x86 Apple platforms) - #130966 (make ptr metadata functions callable from stable const fn) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/lib.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs index 4805e598ce2..75659f46431 100644 --- a/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs @@ -1370,7 +1370,7 @@ Executed at: {executed_at}"#, } if target.starts_with("wasm") && target.contains("wasi") { - self.default_wasi_runner() + self.default_wasi_runner(target) } else { None } @@ -1379,7 +1379,7 @@ Executed at: {executed_at}"#, /// When a `runner` configuration is not provided and a WASI-looking target /// is being tested this is consulted to prove the environment to see if /// there's a runtime already lying around that seems reasonable to use. - fn default_wasi_runner(&self) -> Option<String> { + fn default_wasi_runner(&self, target: TargetSelection) -> Option<String> { let mut finder = crate::core::sanity::Finder::new(); // Look for Wasmtime, and for its default options be sure to disable @@ -1395,6 +1395,11 @@ Executed at: {executed_at}"#, // inherit the entire environment rather than just this single // environment variable. path.push_str(" --env RUSTC_BOOTSTRAP"); + + if target.contains("wasip2") { + path.push_str(" --wasi inherit-network --wasi allow-ip-name-lookup"); + } + return Some(path); } } |
