tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-11-03 20:31:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): properly resolve merge config on mobile build closes #9970

Browse Source 
just applying the change from #10600 to xcode to fix the linked issue :)
This commit is contained in:
Lucas Nogueira 2024-08-13 21:58:06 -03:00
parent 39bf0a1635
commit c92db4c92f
No known key found for this signature in database
GPG Key ID: 7C32FCA95C8C95D7
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/fix-config-override.md Normal file
View File

@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---
Fixes `[android|ios] build --config <config>` failing to resolve.

4
tooling/cli/src/mobile/ios/xcode_script.rs
View File

@ -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() {