From aec14e2f63a4b046fff2c5df84c38b151a7f4e73 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Tue, 11 Feb 2025 03:19:43 -0500 Subject: [PATCH] Fix `naga-fuzz` Build on Windows (#7107) --- naga/fuzz/build.rs | 4 +++- naga/fuzz/fuzz_targets/glsl_parser.rs | 6 +++--- naga/fuzz/fuzz_targets/ir.rs | 6 +++--- naga/fuzz/fuzz_targets/spv_parser.rs | 6 +++--- naga/fuzz/fuzz_targets/wgsl_parser.rs | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/naga/fuzz/build.rs b/naga/fuzz/build.rs index fa71d088a..9ad00f53a 100644 --- a/naga/fuzz/build.rs +++ b/naga/fuzz/build.rs @@ -1,5 +1,7 @@ fn main() { cfg_aliases::cfg_aliases! { - enable_fuzzing: { not(any(target_arch = "wasm32", target_os = "ios", all(windows, target_arch = "aarch64"))) }, + fuzzable_platform: { not(any(target_arch = "wasm32", target_os = "ios", all(windows, target_arch = "aarch64"))) }, } + // This cfg provided by cargo-fuzz + println!("cargo::rustc-check-cfg=cfg(fuzzing)"); } diff --git a/naga/fuzz/fuzz_targets/glsl_parser.rs b/naga/fuzz/fuzz_targets/glsl_parser.rs index 103a84419..159886f0c 100644 --- a/naga/fuzz/fuzz_targets/glsl_parser.rs +++ b/naga/fuzz/fuzz_targets/glsl_parser.rs @@ -1,6 +1,6 @@ -#![cfg_attr(enable_fuzzing, no_main)] +#![cfg_attr(all(fuzzable_platform, fuzzing), no_main)] -#[cfg(enable_fuzzing)] +#[cfg(all(fuzzable_platform, fuzzing))] mod fuzz { use std::iter::FromIterator; @@ -40,5 +40,5 @@ mod fuzz { }); } -#[cfg(not(enable_fuzzing))] +#[cfg(not(all(fuzzable_platform, fuzzing)))] fn main() {} diff --git a/naga/fuzz/fuzz_targets/ir.rs b/naga/fuzz/fuzz_targets/ir.rs index 53815c064..f2e7bea3f 100644 --- a/naga/fuzz/fuzz_targets/ir.rs +++ b/naga/fuzz/fuzz_targets/ir.rs @@ -1,6 +1,6 @@ -#![cfg_attr(enable_fuzzing, no_main)] +#![cfg_attr(all(fuzzable_platform, fuzzing), no_main)] -#[cfg(enable_fuzzing)] +#[cfg(all(fuzzable_platform, fuzzing))] mod fuzz { use libfuzzer_sys::fuzz_target; @@ -14,5 +14,5 @@ mod fuzz { }); } -#[cfg(not(enable_fuzzing))] +#[cfg(not(all(fuzzable_platform, fuzzing)))] fn main() {} diff --git a/naga/fuzz/fuzz_targets/spv_parser.rs b/naga/fuzz/fuzz_targets/spv_parser.rs index cf72644cf..2bc418c82 100644 --- a/naga/fuzz/fuzz_targets/spv_parser.rs +++ b/naga/fuzz/fuzz_targets/spv_parser.rs @@ -1,6 +1,6 @@ -#![cfg_attr(enable_fuzzing, no_main)] +#![cfg_attr(all(fuzzable_platform, fuzzing), no_main)] -#[cfg(enable_fuzzing)] +#[cfg(all(fuzzable_platform, fuzzing))] mod fuzz { use libfuzzer_sys::fuzz_target; use naga::front::spv::{Frontend, Options}; @@ -12,5 +12,5 @@ mod fuzz { }); } -#[cfg(not(enable_fuzzing))] +#[cfg(not(all(fuzzable_platform, fuzzing)))] fn main() {} diff --git a/naga/fuzz/fuzz_targets/wgsl_parser.rs b/naga/fuzz/fuzz_targets/wgsl_parser.rs index 1507ef050..bc34912a0 100644 --- a/naga/fuzz/fuzz_targets/wgsl_parser.rs +++ b/naga/fuzz/fuzz_targets/wgsl_parser.rs @@ -1,6 +1,6 @@ -#![cfg_attr(enable_fuzzing, no_main)] +#![cfg_attr(all(fuzzable_platform, fuzzing), no_main)] -#[cfg(enable_fuzzing)] +#[cfg(all(fuzzable_platform, fuzzing))] mod fuzz { use libfuzzer_sys::fuzz_target; use naga::front::wgsl::Frontend; @@ -11,5 +11,5 @@ mod fuzz { }); } -#[cfg(not(enable_fuzzing))] +#[cfg(not(all(fuzzable_platform, fuzzing)))] fn main() {}