Set RUSTDOCFLAGS environment variable in run_cargo_command_with_callback function

GuillaumeGomez · GuillaumeGomez · commit ad1d5417e705 · 2023-12-04T15:29:23.000+01:00
diff --git a/build_system/src/test.rs b/build_system/src/test.rs
@@ -694,9 +694,12 @@ where
         );
         eprintln!("Using `{}`.", rustc_toolchain_version);
     }
+    let mut env = env.clone();
+    let rustflags = env.get("RUSTFLAGS").cloned().unwrap_or_default();
+    env.insert("RUSTDOCFLAGS".to_string(), rustflags);
     let mut cargo_command: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &toolchain_arg];
     cargo_command.extend_from_slice(&command);
-    callback(&cargo_command, cwd, env)
+    callback(&cargo_command, cwd, &env)
 }
 
 // FIXME(antoyo): linker gives multiple definitions error on Linux

Original file line number	Diff line number	Diff line change
`@@ -694,9 +694,12 @@ where`
`694`	`694`	`);`
`695`	`695`	eprintln!("Using `{}`.", rustc_toolchain_version);
`696`	`696`	`}`
	`697`	`+ let mut env = env.clone();`
	`698`	`+ let rustflags = env.get("RUSTFLAGS").cloned().unwrap_or_default();`
	`699`	`+ env.insert("RUSTDOCFLAGS".to_string(), rustflags);`
`697`	`700`	`let mut cargo_command: Vec<&dyn AsRef<OsStr>> = vec![&"cargo", &toolchain_arg];`
`698`	`701`	`cargo_command.extend_from_slice(&command);`
`699`		`- callback(&cargo_command, cwd, env)`
	`702`	`+ callback(&cargo_command, cwd, &env)`
`700`	`703`	`}`
`701`	`704`
`702`	`705`	`// FIXME(antoyo): linker gives multiple definitions error on Linux`