From 3e203f8633345a078877fa47bc1f304a742ae2a3 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Sun, 5 Apr 2026 14:08:57 -0700 Subject: [PATCH] codex: fix CI failure on PR #16806 Co-authored-by: Codex --- MODULE.bazel | 6 +++++- patches/webrtc-audio-processing-sys_meson_env.patch | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/MODULE.bazel b/MODULE.bazel index 8a82e09d3b..304f283cf3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -418,12 +418,16 @@ bazel_dep(name = "meson", version = "1.5.1.bcr.1") crate.annotation( build_script_tools = [ "@meson//:meson", + "@llvm-project//clang:libclang_interface_output", + "@llvm//:builtin_resource_dir", "@ninja_1.11.0_linux//:ninja_bin", "@ninja_1.12.1_linux_aarch64//:ninja_bin", "@ninja_1.11.0_mac//:ninja_bin", "@ninja_1.11.0_win//:ninja_bin", ], build_script_env = { + "BINDGEN_EXTRA_CLANG_ARGS": "-Xclang -internal-isystem -Xclang $(location @llvm//:builtin_resource_dir)/include", + "LIBCLANG_PATH": "$(location @llvm-project//clang:libclang_interface_output)", "MESON": "$(execpath @meson//:meson)", }, build_script_env_select = { @@ -447,7 +451,7 @@ crate.annotation( ], ) -inject_repo(crate, "meson", "ninja_1.11.0_linux", "ninja_1.12.1_linux_aarch64", "ninja_1.11.0_mac", "ninja_1.11.0_win") +inject_repo(crate, "meson", "ninja_1.11.0_linux", "ninja_1.12.1_linux_aarch64", "ninja_1.11.0_mac", "ninja_1.11.0_win", "llvm", "llvm-project") bazel_dep(name = "v8", version = "14.6.202.9") archive_override( module_name = "v8", diff --git a/patches/webrtc-audio-processing-sys_meson_env.patch b/patches/webrtc-audio-processing-sys_meson_env.patch index 79f1b81076..6ddef62dac 100644 --- a/patches/webrtc-audio-processing-sys_meson_env.patch +++ b/patches/webrtc-audio-processing-sys_meson_env.patch @@ -32,6 +32,11 @@ index 8578e9220a..bd5c9ba382 100644 + .expect("CARGO_MANIFEST_DIR points inside a Bazel runfiles tree"); + let staged_meson = build_dir.join("meson"); + fs::copy(&meson_launcher, &staged_meson).context("Failed to stage Meson launcher")?; ++ let meson_archive = PathBuf::from(&meson_launcher).with_extension("zip"); ++ if meson_archive.exists() { ++ fs::copy(&meson_archive, build_dir.join("meson.zip")) ++ .context("Failed to stage Meson support archive")?; ++ } + let mut meson_runfiles = staged_meson.as_os_str().to_owned(); + meson_runfiles.push(".runfiles"); + let _ = fs::remove_file(&meson_runfiles);