Rewrite build.rs

.github/workflows/develop.yml

@@ -9,39 +9,39 @@ jobs:
   linux-arm64:
     runs-on: ubuntu-24.04-arm
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Build
         run: cargo test --features=asm --release
 
   linux-x64:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Build
         run: cargo test --features=asm --release
 
   macos-arm64:
     runs-on: macos-15
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Build
         run: cargo test --features=asm --release
 
   macos-x64:
     runs-on: macos-15-intel
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Build
         run: cargo test --features=asm --release
 
   qemu-arm64:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup
         run: |
           sudo apt-get update -y
@@ -58,7 +58,7 @@ jobs:
   qemu-riscv64:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup
         run: |
           sudo apt-get update -y
@@ -75,21 +75,21 @@ jobs:
   windows-x64:
     runs-on: windows-2025
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup
         shell: pwsh
         # https://github.com/ScoopInstaller/Install#for-admin
         run: |
           iex "& {$(irm get.scoop.sh)} -RunAsAdmin"
-          scoop install mingw
+          scoop install llvm
       - name: Build
         shell: pwsh
         run: cargo test --features=asm --release
 
   misc:
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       # https://github.com/EmbarkStudios/cargo-deny-action
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:

Cargo.toml

@@ -33,6 +33,7 @@ derive_more = { version = "1", features = ["full"] }
 
 [build-dependencies]
 cc = "1.0"
+clang-finder = "0.1"
 
 [dev-dependencies]
 argparse = "0.2"

build.rs

@@ -3,61 +3,57 @@
 // have to keep features always on, and do conditional compilation within the
 // source code
 
-fn main() {
-    use std::env;
+use std::env;
 
-    let target_family = env::var("CARGO_CFG_TARGET_FAMILY").unwrap_or_default();
+fn main() {
     let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap_or_default();
-    let target_env = env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default();
-    let target = env::var("TARGET").unwrap_or_default();
-    let is_windows = target_family == "windows";
-    let is_msvc = is_windows && (target_env == "msvc");
-    let is_unix = target_family == "unix";
-    let is_x86_64 = target_arch == "x86_64";
-    let is_aarch64 = target_arch == "aarch64";
-    let is_riscv64 = target_arch == "riscv64";
-    let x64_asm = is_x86_64 && (is_windows || is_unix);
-    let aarch64_asm = is_aarch64 && is_unix;
-    // toolchain on sp1 has empty target_family
-    let riscv64_asm = is_riscv64 && (is_unix || target_family.is_empty());
-    let can_enable_asm = x64_asm || aarch64_asm || riscv64_asm;
-
-    if cfg!(feature = "asm") && (!can_enable_asm) {
-        panic!(
-            "Asm feature is not available for target {} on {}!",
-            target_arch, target_family
-        );
+    let target_family = env::var("CARGO_CFG_TARGET_FAMILY").unwrap_or_default();
+    let support_asm = ["aarch64", "riscv64", "x86_64"].contains(&target_arch.as_str());
+    if !support_asm {
+        if cfg!(feature = "asm") {
+            panic!("Asm is not available for {}!", target_arch);
+        }
+        return;
+    }
+    let request_asm = cfg!(feature = "asm") || cfg!(feature = "detect-asm");
+    if !request_asm {
+        return;
     }
 
-    if cfg!(any(feature = "asm", feature = "detect-asm")) && can_enable_asm {
-        println!("cargo:rerun-if-changed=src/machine/asm/execute_x64.S");
-        println!("cargo:rerun-if-changed=src/machine/asm/execute_aarch64.S");
-        println!("cargo:rerun-if-changed=src/machine/asm/execute_riscv64.S");
-        println!("cargo:rerun-if-changed=src/machine/asm/cdefinitions_generated.h");
-
-        let mut build = cc::Build::new();
-
-        if x64_asm {
-            build.file("src/machine/asm/execute_x64.S");
-            if is_msvc {
-                // For now, only an assembly source code is required for CKB-VM, we won't
-                // need to build any C source file here. Hence we can use this simpler solution
-                // to set the default compiler to GCC. We will need to manually trigger the
-                // command to assemble the assembly code file, should any C source file is also
-                // required here.
-                build.compiler("gcc");
+    println!("cargo:rustc-cfg=has_asm");
+    println!("cargo:rerun-if-changed=src/machine/asm/execute_x64.S");
+    println!("cargo:rerun-if-changed=src/machine/asm/execute_aarch64.S");
+    println!("cargo:rerun-if-changed=src/machine/asm/execute_riscv64.S");
+    println!("cargo:rerun-if-changed=src/machine/asm/cdefinitions_generated.h");
+
+    match target_arch.as_str() {
+        "aarch64" => {
+            cc::Build::new()
+                .include("src/machine/asm")
+                .file("src/machine/asm/execute_aarch64.S")
+                .compile("asm");
+        }
+        "riscv64" => {
+            cc::Build::new()
+                .include("src/machine/asm")
+                .file("src/machine/asm/execute_riscv64.S")
+                .compile("asm");
+        }
+        "x86_64" => match target_family.as_str() {
+            "windows" => {
+                cc::Build::new()
+                    .compiler(clang_finder::find())
+                    .include("src/machine/asm")
+                    .file("src/machine/asm/execute_x64.S")
+                    .compile("asm");
             }
-        } else if aarch64_asm {
-            build.file("src/machine/asm/execute_aarch64.S");
-        } else if riscv64_asm {
-            if target.contains("zkvm") || target.contains("succinct") {
-                build.compiler("riscv64-linux-gnu-gcc");
+            _ => {
+                cc::Build::new()
+                    .include("src/machine/asm")
+                    .file("src/machine/asm/execute_x64.S")
+                    .compile("asm");
             }
-            build.file("src/machine/asm/execute_riscv64.S");
-        }
-
-        build.include("src/machine/asm").compile("asm");
-
-        println!("cargo:rustc-cfg=has_asm")
+        },
+        _ => {}
     }
 }