Skip to content

Commit 9089d97

Browse files
authored
fix(cli): properly resolve merge config on mobile build closes #9970 (#10605)
just applying the change from #10600 to xcode to fix the linked issue :)
1 parent b6dca99 commit 9089d97

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

.changes/fix-config-override.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri-cli": patch:bug
3+
"@tauri-apps/cli": patch:bug
4+
---
5+
6+
Fixes `[android|ios] build --config <config>` failing to resolve.

tooling/cli/src/mobile/ios/xcode_script.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ pub fn command(options: Options) -> Result<()> {
9595
MobileTarget::Ios,
9696
)?;
9797

98+
if let Some(config) = &cli_options.config {
99+
crate::helpers::config::merge_with(&config.0)?;
100+
}
101+
98102
let env = env()?.explicit_env_vars(cli_options.vars);
99103

100104
if !options.sdk_root.is_dir() {

0 commit comments

Comments
 (0)