From 87fb1554d5c563b111becd5e61843f924654232d Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Sun, 8 Nov 2026 12:05:34 +0000 Subject: [PATCH 1/2] Fix make install on Linux by only passing universal arch flags on macOS Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 1 + Makefile | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa70da5..44fad92d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Fix nested target attributes (e.g. `attributes.SystemCapabilities`) being serialized as a stringified Swift `Dictionary` description instead of a proper nested plist dictionary, which also caused non-deterministic key ordering in generated `project.pbxproj` files across runs #1639 @imadaan @sergeyospanov - Fix `.DS_Store` and `.orig` files causing projects to be regenerated when using `--use-cache` #1622 @kimjune01 - Fix generated "Copy Bundle Resources" phases missing `dstPath`, which caused Xcode 27.2 project conversion to fail #1654 @Ckitakishi +- Fix `make install` failing on Linux by only passing `--arch arm64 --arch x86_64` when building on macOS @vintoware ### Internal - Use a dedicated local package in the SPM fixture so generated fixtures don't depend on the checkout directory name, such as when running tests from a git worktree @yonaskolb diff --git a/Makefile b/Makefile index 47fff7bc..1c82f676 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,10 @@ INSTALL_PATH = $(PREFIX)/bin/$(EXECUTABLE_NAME) SHARE_PATH = $(PREFIX)/share/$(EXECUTABLE_NAME) CURRENT_PATH = $(PWD) REPO = https://github.com/yonaskolb/$(TOOL_NAME) -SWIFT_BUILD_FLAGS = --disable-sandbox -c release --arch arm64 --arch x86_64 +SWIFT_BUILD_FLAGS = --disable-sandbox -c release +ifeq ($(shell uname -s),Darwin) + SWIFT_BUILD_FLAGS += --arch arm64 --arch x86_64 +endif BUILD_PATH = $(shell swift build $(SWIFT_BUILD_FLAGS) --show-bin-path) EXECUTABLE_PATH = $(BUILD_PATH)/$(EXECUTABLE_NAME) From 145ff1e12226c7e389434d5a83065540dbfab165 Mon Sep 17 00:00:00 2001 From: Vasyl Solovei Date: Sun, 8 Nov 2026 12:05:58 +0000 Subject: [PATCH 2/2] Add changelog PR number Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44fad92d..980cb550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,7 +18,7 @@ - Fix nested target attributes (e.g. `attributes.SystemCapabilities`) being serialized as a stringified Swift `Dictionary` description instead of a proper nested plist dictionary, which also caused non-deterministic key ordering in generated `project.pbxproj` files across runs #1639 @imadaan @sergeyospanov - Fix `.DS_Store` and `.orig` files causing projects to be regenerated when using `--use-cache` #1622 @kimjune01 - Fix generated "Copy Bundle Resources" phases missing `dstPath`, which caused Xcode 27.2 project conversion to fail #1654 @Ckitakishi -- Fix `make install` failing on Linux by only passing `--arch arm64 --arch x86_64` when building on macOS @vintoware +- Fix `make install` failing on Linux by only passing `--arch arm64 --arch x86_64` when building on macOS #1665 @vintoware ### Internal - Use a dedicated local package in the SPM fixture so generated fixtures don't depend on the checkout directory name, such as when running tests from a git worktree @yonaskolb