Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test Zig 0.13.0 #256

Merged
merged 2 commits into from
Jun 20, 2024
+4 −3
Merged

Test Zig 0.13.0 #256

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4d249a
Test Zig 0.13.0
messense Jun 20, 2024
1b19b49
-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST
messense Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/CI.yml
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ jobs:
matrix:
os: [ubuntu-latest, macos-13, windows-latest]
toolchain: [1.74.0, stable, nightly]
zig: [0.10.1, 0.12.0, master]
zig: [0.10.1, 0.13.0, master]
exclude:
# Only test MSRV with zig stable version
- toolchain: 1.74.0
@@ -190,7 +190,7 @@ jobs:
cargo run zigbuild --target aarch64-unknown-linux-musl
cargo run zigbuild --target aarch64-unknown-linux-musl --manifest-path tests/hello-rustls/Cargo.toml
- name: Windows - Test gnu build
if: matrix.zig != '0.12.0'
if: matrix.zig != '0.13.0'
run: |
cargo run zigbuild --target x86_64-pc-windows-gnu
cargo run zigbuild --target x86_64-pc-windows-gnu --manifest-path tests/hello-windows/Cargo.toml
@@ -201,7 +201,7 @@ jobs:
run: |
cargo run zigbuild --target aarch64-unknown-linux-gnu --manifest-path tests/hello-rustls/Cargo.toml --features curl
- name: Windows - Test run
if: ${{ matrix.os == 'windows-latest' && matrix.zig != '0.12.0' }}
if: ${{ matrix.os == 'windows-latest' && matrix.zig != '0.13.0' }}
run: |
./target/x86_64-pc-windows-gnu/debug/cargo-zigbuild.exe zigbuild --help
./tests/hello-windows/target/x86_64-pc-windows-gnu/debug/hello-windows.exe
1 change: 1 addition & 0 deletions src/zig.rs
View file
Original file line number Diff line number Diff line change
@@ -724,6 +724,7 @@ impl Zig {
args.push("-D_LIBCPP_PSTL_CPU_BACKEND_SERIAL".to_owned());
args.push("-D_LIBCPP_ABI_VERSION=1".to_owned());
args.push("-D_LIBCPP_ABI_NAMESPACE=__1".to_owned());
args.push("-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST".to_owned());
if let Some(ver) = c_opts.glibc_minor_ver {
// Handled separately because we have no way to infer this without Zig
args.push(format!("-D__GLIBC_MINOR__={ver}"));