Don't join cargo flags

Author: ark0f

substrate/utils/wasm-builder/src/builder.rs

@@ -276,7 +276,7 @@ impl WasmBuilder {
 			target,
 			file_path,
 			self.project_cargo_toml,
-			self.cargo_flags.join(" "),
+			self.cargo_flags,
 			self.rust_flags.join(" "),
 			self.features_to_enable,
 			self.file_name,
@@ -353,7 +353,7 @@ fn build_project(
 	target: RuntimeTarget,
 	file_name: PathBuf,
 	project_cargo_toml: PathBuf,
-	default_cargo_flags: String,
+	default_cargo_flags: Vec<String>,
 	default_rustflags: String,
 	features_to_enable: Vec<String>,
 	wasm_binary_name: Option<String>,

substrate/utils/wasm-builder/src/wasm_project.rs

@@ -117,7 +117,7 @@ fn crate_metadata(cargo_manifest: &Path) -> Metadata {
 pub(crate) fn create_and_compile(
 	target: RuntimeTarget,
 	orig_project_cargo_toml: &Path,
-	default_cargo_flags: &str,
+	default_cargo_flags: &[String],
 	default_rustflags: &str,
 	cargo_cmd: CargoCommandVersioned,
 	features_to_enable: Vec<String>,
@@ -832,7 +832,7 @@ fn build_bloaty_blob(
 	target: RuntimeTarget,
 	blob_build_profile: &Profile,
 	project: &Path,
-	default_cargo_flags: &str,
+	default_cargo_flags: &[String],
 	default_rustflags: &str,
 	cargo_cmd: CargoCommandVersioned,
 	#[cfg(feature = "metadata-hash")] metadata_hash: Option<[u8; 32]>,
@@ -874,7 +874,7 @@ fn build_bloaty_blob(
 		.arg("rustc")
 		.arg(format!("--target={}", target.rustc_target(&cargo_cmd)))
 		.arg(format!("--manifest-path={}", manifest_path.display()))
-		.arg(default_cargo_flags)
+		.args(default_cargo_flags)
 		.env("RUSTFLAGS", rustflags)
 		// Manually set the `CARGO_TARGET_DIR` to prevent a cargo deadlock (cargo locks a target dir
 		// exclusive). The runner project is created in `CARGO_TARGET_DIR` and executing it will