From f621c252ec82baae0b81a03b4e5b7a59703ffcee Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 29 Nov 2019 20:07:55 +0100 Subject: [PATCH] really_init cmdline args on Miri --- src/libstd/sys/unix/args.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/libstd/sys/unix/args.rs b/src/libstd/sys/unix/args.rs index 15dafb1bcf9..2ed1585395e 100644 --- a/src/libstd/sys/unix/args.rs +++ b/src/libstd/sys/unix/args.rs @@ -80,7 +80,13 @@ unsafe fn really_init(argc: isize, argv: *const *const u8) { #[inline(always)] pub unsafe fn init(_argc: isize, _argv: *const *const u8) { - #[cfg(not(all(target_os = "linux", target_env = "gnu")))] + // On Linux-GNU, we rely on `ARGV_INIT_ARRAY` below to initialize + // `ARGC` and `ARGV`. But in Miri that does not actually happen so we + // still initialize here. + #[cfg(any( + miri, + not(all(target_os = "linux", target_env = "gnu")) + ))] really_init(_argc, _argv); } -- 2.44.0