From df846c75c64af69c590440c37d45da82e5e40561 Mon Sep 17 00:00:00 2001
From: Alan Liddell <aliddell@chanzuckerberg.com>
Date: Wed, 21 Feb 2024 16:24:45 -0500
Subject: [PATCH] Fix build failures on macOS (#170)

- Pin cc dependency to 1.0.83 ([possible
issue](https://github.com/rust-lang/cc-rs/issues/959)).
- Remove erroneously specified [target triple
](https://docs.rs/cmake/latest/cmake/struct.Config.html#method.target)
in build script.
- Consolidate build jobs between target platforms.
---
 .github/workflows/build.yml | 9 ---------
 Cargo.toml                  | 1 +
 build.rs                    | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c277a7b..161f223 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,16 +17,7 @@ jobs:
         with:
           submodules: true
 
-      - name: Build (macOS)
-        if: matrix.platform == 'macos-latest'
-        uses: messense/maturin-action@v1
-        with:
-          command: build
-          target: universal2-apple-darwin
-          args: --release -o dist
-
       - name: Build
-        if: matrix.platform != 'macos-latest'
         uses: messense/maturin-action@v1
         with:
           command: build
diff --git a/Cargo.toml b/Cargo.toml
index 95ddcd7..4277d02 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,3 +32,4 @@ reqwest = { version = "0.11", features = ["blocking", "json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 zip-extract = "0.1"
+cc = "=1.0.83"
diff --git a/build.rs b/build.rs
index 894e7d6..c8ef7e0 100644
--- a/build.rs
+++ b/build.rs
@@ -19,7 +19,6 @@ fn main() {
         serde_json::from_str(drivers_json.as_str()).expect("Failed to parse drivers.json");
 
     let dst = cmake::Config::new("acquire-common")
-        .target("acquire-common")
         .profile("RelWithDebInfo")
         .static_crt(true)
         .define("NOTEST", "TRUE")