From c92db4c92fab5d001669faf6ad701c9c76e43748 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Tue, 13 Aug 2024 21:58:06 -0300 Subject: [PATCH] fix(cli): properly resolve merge config on mobile build closes #9970 just applying the change from #10600 to xcode to fix the linked issue :) --- .changes/fix-config-override.md | 6 ++++++ tooling/cli/src/mobile/ios/xcode_script.rs | 4 ++++ 2 files changed, 10 insertions(+) create mode 100644 .changes/fix-config-override.md diff --git a/.changes/fix-config-override.md b/.changes/fix-config-override.md new file mode 100644 index 000000000..29d94e701 --- /dev/null +++ b/.changes/fix-config-override.md @@ -0,0 +1,6 @@ +--- +"tauri-cli": patch:bug +"@tauri-apps/cli": patch:bug +--- + +Fixes `[android|ios] build --config ` failing to resolve. diff --git a/tooling/cli/src/mobile/ios/xcode_script.rs b/tooling/cli/src/mobile/ios/xcode_script.rs index f342cd052..12aeda72f 100644 --- a/tooling/cli/src/mobile/ios/xcode_script.rs +++ b/tooling/cli/src/mobile/ios/xcode_script.rs @@ -95,6 +95,10 @@ pub fn command(options: Options) -> Result<()> { MobileTarget::Ios, )?; + if let Some(config) = &cli_options.config { + crate::helpers::config::merge_with(&config.0)?; + } + let env = env()?.explicit_env_vars(cli_options.vars); if !options.sdk_root.is_dir() {