]> git.lizzy.rs Git - rust.git/commitdiff
really_init cmdline args on Miri
authorRalf Jung <post@ralfj.de>
Fri, 29 Nov 2019 19:07:55 +0000 (20:07 +0100)
committerRalf Jung <post@ralfj.de>
Fri, 29 Nov 2019 19:07:55 +0000 (20:07 +0100)
src/libstd/sys/unix/args.rs

index 15dafb1bcf96444cf5dda16210a96d5102bc5418..2ed1585395e224f8658806f2983d068aee2cb118 100644 (file)
@@ -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);
     }