pub/spaceshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(bundle): provide per-arch spaceshd sidecars for universal build

Browse Source 
Tauri's universal target builds each arch separately and resolves externalBin
with that arch's triple (spaceshd-aarch64-apple-darwin / -x86_64-apple-darwin),
lipo'ing them itself. The previous single -universal-apple-darwin sidecar made
the per-arch sub-build fail with 'resource path ... doesn't exist'.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Vassiliy Yegorov
2026-06-15 11:41:57 +07:00
parent 2fc58105a5
commit 99a916fed6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -35,14 +35,14 @@ targets: ## add rust targets for the universal build
.PHONY: dmg .PHONY: dmg
dmg: targets ## build the universal (Intel + Apple Silicon) .dmg — UNSIGNED dmg: targets ## build the universal (Intel + Apple Silicon) .dmg — UNSIGNED
# Build the daemon for both arches and lipo into a universal sidecar so it # Tauri's universal build compiles each arch separately and expects a sidecar
# ships inside spacesh.app/Contents/MacOS/spaceshd (else the GUI is offline). # named with THAT arch's triple; it lipo's them into the universal bundle and
# ships spaceshd inside spacesh.app/Contents/MacOS (else the GUI is offline).
cargo build --release -p spaceshd --target aarch64-apple-darwin cargo build --release -p spaceshd --target aarch64-apple-darwin
cargo build --release -p spaceshd --target x86_64-apple-darwin cargo build --release -p spaceshd --target x86_64-apple-darwin
mkdir -p $(SIDECAR_DIR) mkdir -p $(SIDECAR_DIR)
lipo -create -output $(SIDECAR_DIR)/spaceshd-universal-apple-darwin \ cp target/aarch64-apple-darwin/release/spaceshd $(SIDECAR_DIR)/spaceshd-aarch64-apple-darwin
target/aarch64-apple-darwin/release/spaceshd \ cp target/x86_64-apple-darwin/release/spaceshd $(SIDECAR_DIR)/spaceshd-x86_64-apple-darwin
target/x86_64-apple-darwin/release/spaceshd
cd $(APP_DIR) && npm run tauri build -- --target $(TAURI_TARGET) --config $(BUNDLE_CONFIG) cd $(APP_DIR) && npm run tauri build -- --target $(TAURI_TARGET) --config $(BUNDLE_CONFIG)
@echo "→ $(DMG_DIR)" && ls -lh $(DMG_DIR)/*.dmg @echo "→ $(DMG_DIR)" && ls -lh $(DMG_DIR)/*.dmg