Skip to content

Commit

Permalink
Upgrade target-lexicon to 0.13.0 (#298)
Browse files Browse the repository at this point in the history
* Upgrade target-lexicon to 0.13.0

* Update README.md to use ghcr.io
  • Loading branch information
messense authored Dec 16, 2024
1 parent c447738 commit a85bc27
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
50 changes: 25 additions & 25 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ semver = "1.0.5"
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.79"
shlex = "1"
target-lexicon = { version = "0.12.15", features = ["std"] }
target-lexicon = { version = "0.13.0", features = ["std"] }
which = "7.0.0"

[features]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ We also provide Docker images which has macOS SDK pre-installed in addition to c

- Linux docker image ([ghcr.io](https://github.com/rust-cross/cargo-zigbuild/pkgs/container/cargo-zigbuild), [Docker Hub](https://hub.docker.com/r/messense/cargo-zigbuild)):
```bash
docker run --rm -it -v $(pwd):/io -w /io messense/cargo-zigbuild \
docker run --rm -it -v $(pwd):/io -w /io ghcr.io/rust-cross/cargo-zigbuild \
cargo zigbuild --release --target x86_64-apple-darwin
```

- Windows docker image ([ghcr.io](https://github.com/rust-cross/cargo-zigbuild/pkgs/container/cargo-zigbuild.windows), [Docker Hub](https://hub.docker.com/r/messense/cargo-zigbuild.windows)):
```powershell
docker run --rm -it -v ${pwd}:c:\io -w c:\io messense/cargo-zigbuild.windows `
docker run --rm -it -v ${pwd}:c:\io -w c:\io ghcr.io/rust-cross/cargo-zigbuild.windows `
cargo zigbuild --target x86_64-apple-darwin
```
> [!NOTE]
Expand Down
2 changes: 1 addition & 1 deletion src/zig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ pub fn prepare_zig_linker(target: &str) -> Result<ZigWrapper> {
};
cc_args.push(format!("-target {zig_arch}-linux-{target_env}{abi_suffix}"));
}
OperatingSystem::MacOSX { .. } | OperatingSystem::Darwin => {
OperatingSystem::MacOSX { .. } | OperatingSystem::Darwin(_) => {
let zig_version = Zig::zig_version()?;
// Zig 0.10.0 switched macOS ABI to none
// see https://github.com/ziglang/zig/pull/11684
Expand Down

0 comments on commit a85bc27

Please sign in to comment.