From da876d94471191d821dc20a6bbe9eeee1f2068ac Mon Sep 17 00:00:00 2001
From: Dmitry Kovba <dkovba@apple.com>
Date: Mon, 23 Mar 2026 14:17:10 -0700
Subject: [PATCH 1/2] Use an explicit path to Swift from Swiftly

---
 vminitd/Makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vminitd/Makefile b/vminitd/Makefile
index 14b27c53..0e57daaf 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -24,7 +24,8 @@ SWIFT_SDK_PATH := /tmp/$(notdir $(SWIFT_SDK_URL))
 SWIFTLY_URL := https://download.swift.org/swiftly/darwin/swiftly.pkg
 SWIFTLY_FILENAME := $(notdir $(SWIFTLY_URL))
 SWIFTLY_BIN_DIR ?= ~/.swiftly/bin
-BUILD_BIN_DIR := $(shell swift build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --show-bin-path)
+SWIFT := $(SWIFTLY_BIN_DIR)/swift
+BUILD_BIN_DIR := $(shell $(SWIFT) build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --show-bin-path)
 
 SYSTEM_TYPE := $(shell uname -s)
 ifeq ($(SYSTEM_TYPE),Darwin)
@@ -41,8 +42,8 @@ all:
 	@mkdir -p ./bin/
 	@rm -f ./bin/vminitd
 	@rm -f ./bin/vmexec
-	@swift --version
-	@swift build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION)
+	@$(SWIFT) --version
+	@$(SWIFT) build -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION)
 	@install "$(BUILD_BIN_DIR)/vminitd" ./bin/
 	@install "$(BUILD_BIN_DIR)/vmexec" ./bin/
 
@@ -70,7 +71,7 @@ swift: swiftly
 linux-sdk: swift
 	@echo Installing Static Linux SDK...
 	@curl -L -o $(SWIFT_SDK_PATH) $(SWIFT_SDK_URL)
-	-@swift sdk install $(SWIFT_SDK_PATH)
+	-@$(SWIFT) sdk install $(SWIFT_SDK_PATH)
 	@rm $(SWIFT_SDK_PATH)
 
 .PHONY: macos-sdk
@@ -96,4 +97,4 @@ clean:
 	@echo Cleaning the vminitd build files...
 	@rm -f ./bin/vminitd
 	@rm -f ./bin/vmexec
-	@swift package clean $(SWIFT_CONFIGURATION)
+	@$(SWIFT) package clean $(SWIFT_CONFIGURATION)

From 37e4b51d666b87c3fae8377534b750ded121e91c Mon Sep 17 00:00:00 2001
From: Dmitry Kovba <dkovba@apple.com>
Date: Mon, 23 Mar 2026 14:41:32 -0700
Subject: [PATCH 2/2] Do not use Swift from Swiftly before installing it on
 GitHub runners

---
 vminitd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vminitd/Makefile b/vminitd/Makefile
index 0e57daaf..8ed84c95 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -97,4 +97,4 @@ clean:
 	@echo Cleaning the vminitd build files...
 	@rm -f ./bin/vminitd
 	@rm -f ./bin/vmexec
-	@$(SWIFT) package clean $(SWIFT_CONFIGURATION)
+	@rm -rf .build