From c1f37c4443f9bf9f2c39afbc747e93fca8489262 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 13 Feb 2026 22:02:41 +0000 Subject: [PATCH 1/2] Initial plan From 69306d915e02c84c9d8878b2592a7f2a27374652 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 13 Feb 2026 22:06:00 +0000 Subject: [PATCH 2/2] Make --build_wasm_static_lib implicitly enable --build_wasm When --build_wasm_static_lib is specified, treat --build_wasm as implicitly enabled. This is done in build_args.py's post-processing section, before the cmake generator is selected, so that all downstream logic correctly recognizes this as a wasm build. The redundant check in build.py is removed since it's now handled earlier in the argument parsing phase. Fixes #27313 Co-authored-by: fs-eire <7679871+fs-eire@users.noreply.github.com> --- tools/ci_build/build.py | 3 --- tools/ci_build/build_args.py | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 05e1f96b7610c..2eae00b8ad849 100644 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -2346,9 +2346,6 @@ def main(): if args.nnapi_min_api < 27: raise BuildError("--nnapi_min_api should be 27+") - if args.build_wasm_static_lib: - args.build_wasm = True - if args.build_wasm: if not args.disable_wasm_exception_catching and args.disable_exceptions: # When '--disable_exceptions' is set, we set '--disable_wasm_exception_catching' as well diff --git a/tools/ci_build/build_args.py b/tools/ci_build/build_args.py index f32666f65cc38..b01354fc5db74 100644 --- a/tools/ci_build/build_args.py +++ b/tools/ci_build/build_args.py @@ -935,6 +935,10 @@ def convert_arg_line_to_args(self, arg_line: str) -> list[str]: # Use list[str] if args.android_ndk_path: args.android_ndk_path = os.path.normpath(args.android_ndk_path) + # Treat --build_wasm_static_lib as implying --build_wasm + if args.build_wasm_static_lib: + args.build_wasm = True + # Handle WASM exception logic if args.enable_wasm_api_exception_catching: args.disable_wasm_exception_catching = True # Catching at API level implies disabling broader catching