vcpkg and mpir fix

Chia-Network · Sep 22, 2024 · 4e50a36 · 4e50a36
1 parent ed9461b
commit 4e50a36
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -100,7 +100,7 @@ jobs:
 
       - name: Install MPIR on Windows
         if: matrix.os.name == 'Windows'
-        run: vcpkg install mpir
+        run: vcpkg install mpir:x64-windows-static
 
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@stable
@@ -128,7 +128,6 @@ jobs:
         run: |
           cd rust_bindings
           cp -r ../src cpp
-          git clone https://github.com/Chia-Network/mpir_gc_x64.git
 
       - name: Publish to crates.io (dry run)
         # We use `--allow-dirty` because the `cpp` folder is copied into the working directory.

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rust_bindings/Cargo.toml b/rust_bindings/Cargo.toml
@@ -14,6 +14,7 @@ link-cplusplus = "1.0.9"
 [build-dependencies]
 bindgen = "0.69.4"
 cmake = "0.1.50"
+vcpkg = "0.2.15"
 
 [dev-dependencies]
 hex = "0.4.3"

diff --git a/rust_bindings/build.rs b/rust_bindings/build.rs
@@ -45,7 +45,7 @@ fn main() {
                 .unwrap()
         );
 
-        println!("cargo:rustc-link-lib=static=mpir");
+        vcpkg::find_package("mpir").unwrap();
     } else {
         println!(
             "cargo:rustc-link-search=native={}",