Supporting the nightly flag -Zmultitarget

src/build.rs

@@ -105,8 +105,13 @@ pub struct Build {
     pub no_default_features: bool,
 
     /// Build for the target triple
-    #[clap(long, value_name = "TRIPLE", env = "CARGO_BUILD_TARGET")]
-    pub target: Option<String>,
+    #[clap(
+        long,
+        value_name = "TRIPLE",
+        env = "CARGO_BUILD_TARGET",
+        multiple_occurrences = true
+    )]
+    pub target: Vec<String>,
 
     /// Directory for all generated artifacts
     #[clap(long, value_name = "DIRECTORY", parse(from_os_str))]
@@ -190,10 +195,10 @@ impl Build {
         let mut build = Command::new("cargo");
         build.arg(subcommand);
 
-        let rust_target = self
+        let rust_targets = self
             .target
-            .as_ref()
-            .map(|target| target.split_once('.').map(|(t, _)| t).unwrap_or(target));
+            .iter()
+            .map(|target| target.split_once('.').map(|(t, _)| t).unwrap_or(&target));
 
         // collect cargo build arguments
         if self.quiet {
@@ -259,9 +264,11 @@ impl Build {
         if self.no_default_features {
             build.arg("--no-default-features");
         }
-        if let Some(rust_target) = rust_target {
-            build.arg("--target").arg(&rust_target);
-        }
+
+        rust_targets.for_each(|target| {
+            build.arg("--target").arg(&target);
+        });
+
         if let Some(dir) = self.target_dir.as_ref() {
             build.arg("--target-dir").arg(dir);
         }
@@ -310,14 +317,15 @@ impl Build {
 
         if !self.disable_zig_linker {
             // setup zig as linker
-            if let Some(target) = self.target.as_ref() {
-                let rustc_meta = rustc_version::version_meta()?;
-                let host_target = &rustc_meta.host;
-                // we only setup zig as linker when target isn't exactly the same as host target
-                if host_target != target {
-                    if let Some(rust_target) = rust_target {
+            let rustc_meta = rustc_version::version_meta()?;
+            let host_target = &rustc_meta.host;
+            // we only setup zig as linker when target isn't exactly the same as host target
+
+            for (i, full_target) in self.target.iter().enumerate() {
+                if host_target != full_target {
+                    if let Some(rust_target) = self.target.get(i) {
                         let env_target = rust_target.to_uppercase().replace('-', "_");
-                        let (zig_cc, zig_cxx) = prepare_zig_linker(target)?;
+                        let (zig_cc, zig_cxx) = prepare_zig_linker(full_target)?;
                         if is_mingw_shell() {
                             let zig_cc = zig_cc.to_slash_lossy();
                             build.env("TARGET_CC", &zig_cc);
@@ -351,7 +359,7 @@ impl Build {
     }
 
     fn setup_os_deps(&self) -> Result<()> {
-        if let Some(target) = self.target.as_ref() {
+        for target in &self.target {
             if target.contains("apple") {
                 let target_dir = if let Some(target_dir) = self.target_dir.clone() {
                     target_dir.join(target)

src/rustc.rs

@@ -88,8 +88,13 @@ pub struct Rustc {
     pub no_default_features: bool,
 
     /// Build for the target triple
-    #[clap(long, value_name = "TRIPLE", env = "CARGO_BUILD_TARGET")]
-    pub target: Option<String>,
+    #[clap(
+        long,
+        value_name = "TRIPLE",
+        env = "CARGO_BUILD_TARGET",
+        multiple_occurrences = true
+    )]
+    pub target: Vec<String>,
 
     /// Output compiler information without compiling
     #[clap(long, value_name = "INFO")]