Skip to content

Commit

Permalink
Fix build failures on macOS (#170)
Browse files Browse the repository at this point in the history
- Pin cc dependency to 1.0.83 ([possible
issue](rust-lang/cc-rs#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.
  • Loading branch information
aliddell committed Feb 21, 2024
1 parent f681474 commit df846c7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 0 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit df846c7

Please sign in to comment.