fix(cli): get-target (#270)

succinctlabs · Feb 23, 2024 · aa71d90 · aa71d90
1 parent 81f01f9
commit aa71d90
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -27,3 +27,4 @@ serde_json = "1.0.113"
 yansi = "0.5.1"
 hex = "0.4.3"
 anstyle = "1.0.6"
+target-lexicon = "0.12.13"
diff --git a/cli/src/commands/install_toolchain.rs b/cli/src/commands/install_toolchain.rs
@@ -57,7 +57,7 @@ impl InstallToolchainCmd {
         let target = get_target();
         let toolchain_asset_name = format!("rust-toolchain-{}.tar.gz", target);
         let toolchain_archive_path = root_dir.join(toolchain_asset_name.clone());
-        let toolchain_dir = root_dir.join(target);
+        let toolchain_dir = root_dir.join(&target);
         let toolchain_download_url = get_toolchain_download_url();
 
         // Download the toolchain.
@@ -84,7 +84,7 @@ impl InstallToolchainCmd {
         fs::create_dir_all(toolchain_dir)?;
         Command::new("tar")
             .current_dir(&root_dir)
-            .args(["-xzf", &toolchain_asset_name, "-C", target])
+            .args(["-xzf", &toolchain_asset_name, "-C", &target])
             .run()?;
 
         // Move the toolchain to a random directory (avoid rustup bugs).
@@ -95,7 +95,7 @@ impl InstallToolchainCmd {
             .collect();
         Command::new("mv")
             .current_dir(&root_dir)
-            .args([target, &random_string])
+            .args([&target, &random_string])
             .run()?;
 
         // Link the toolchain to rustup.

diff --git a/cli/src/lib.rs b/cli/src/lib.rs
@@ -10,6 +10,7 @@ use std::cmp::min;
 use std::fs::File as SyncFile;
 use std::io::Write;
 use std::process::{Command, Stdio};
+use target_lexicon;
 
 pub const RUSTUP_TOOLCHAIN_NAME: &str = "succinct";
 
@@ -62,18 +63,8 @@ pub async fn download_file(client: &Client, url: &str, path: &str) -> Result<(),
     Ok(())
 }
 
-#[allow(unreachable_code)]
-pub fn get_target() -> &'static str {
-    #[cfg(all(target_arch = "x86_64", target_os = "linux"))]
-    return "x86_64-unknown-linux-gnu";
-
-    #[cfg(all(target_arch = "aarch64", target_os = "linux"))]
-    return "aarch64-unknown-linux-gnu";
-
-    #[cfg(all(target_arch = "aarch64", target_os = "macos"))]
-    return "aarch64-apple-darwin";
-
-    panic!("Unsupported architecture. Please build the toolchain from source.")
+pub fn get_target() -> String {
+    target_lexicon::HOST.to_string()
 }
 
 #[allow(unreachable_code)]