diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a6885dccb..64883664c 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -70,6 +70,7 @@ jobs:
         # queries: security-extended,security-and-quality
 
     - name: Restore Rust Cache
+      if: matrix.language != 'swift'
       uses: Swatinem/rust-cache@v2
       with:
         key: "${{ matrix.language }}"
diff --git a/xcframework/src/main.rs b/xcframework/src/main.rs
index 6dd763b3a..f84b6fef4 100644
--- a/xcframework/src/main.rs
+++ b/xcframework/src/main.rs
@@ -198,7 +198,8 @@ impl LibraryGroup {
         recreate_directory(&dir)?;
 
         let dest = dir.join(LIBRARY_FILENAME);
-        Command::new("lipo")
+        Command::new("xcrun")
+            .arg("lipo")
             .arg("-create")
             .args(libraries)
             .arg("-output")
@@ -352,8 +353,10 @@ impl ExecuteCommand for Command {
             Ok(output)
         } else {
             anyhow::bail!(
-                "Command failed with exit code: {}\n$ {:?}",
+                "Command failed with exit code: {}\nstdout: {:?}\nstderr: {:?}\n$ {:?}",
                 output.status,
+                String::from_utf8_lossy(&output.stdout),
+                String::from_utf8_lossy(&output.stderr),
                 self
             )
         }