From e5d6226bd4f3ed86e9a9771e58db0884db005c94 Mon Sep 17 00:00:00 2001
From: Dmitry Kovba <dkovba@apple.com>
Date: Mon, 23 Mar 2026 16:33:05 -0700
Subject: [PATCH 1/3] Remove the not used `xcode-cltools` target

---
 vminitd/Makefile | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/vminitd/Makefile b/vminitd/Makefile
index 14b27c53..92255e37 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -75,18 +75,12 @@ linux-sdk: swift
 
 .PHONY: macos-sdk
 macos-sdk:
-	# Consider switching back to `xcode-cltools`, when possible.
 	@if [ $(MACOS_MAJOR) -gt 15 ] && [ "$(MACOS_RELEASE_TYPE)" = "" ]; then \
 	  "$(MAKE)" xcode; \
 	else \
 	  "$(MAKE)" xcode; \
 	fi
 
-.PHONY: xcode-cltools
-xcode-cltools:
-	@echo Activating Xcode Command Line Tools...
-	@sudo xcode-select --switch /Library/Developer/CommandLineTools
-
 .PHONY: xcode
 xcode:
 	@echo "Please install the latest version of Xcode 26 and set the path for the active developer directory using \`sudo xcode-select -s <PATH_TO_XCODE>\`".

From c1cedf4141221492b539a6083be82e0133cf4499 Mon Sep 17 00:00:00 2001
From: Dmitry Kovba <dkovba@apple.com>
Date: Mon, 23 Mar 2026 16:34:14 -0700
Subject: [PATCH 2/3] Remove the no longer used version check

---
 vminitd/Makefile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/vminitd/Makefile b/vminitd/Makefile
index 92255e37..20cfacf9 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -74,12 +74,7 @@ linux-sdk: swift
 	@rm $(SWIFT_SDK_PATH)
 
 .PHONY: macos-sdk
-macos-sdk:
-	@if [ $(MACOS_MAJOR) -gt 15 ] && [ "$(MACOS_RELEASE_TYPE)" = "" ]; then \
-	  "$(MAKE)" xcode; \
-	else \
-	  "$(MAKE)" xcode; \
-	fi
+macos-sdk: xcode
 
 .PHONY: xcode
 xcode:

From 27666a5d7240947f4f6b6d25d3c3b3950db0c982 Mon Sep 17 00:00:00 2001
From: Dmitry Kovba <dkovba@apple.com>
Date: Mon, 23 Mar 2026 16:35:27 -0700
Subject: [PATCH 3/3] Merge the `macos-sdk` and `xcode` targets

---
 vminitd/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/vminitd/Makefile b/vminitd/Makefile
index 20cfacf9..49aeaaa3 100644
--- a/vminitd/Makefile
+++ b/vminitd/Makefile
@@ -74,10 +74,7 @@ linux-sdk: swift
 	@rm $(SWIFT_SDK_PATH)
 
 .PHONY: macos-sdk
-macos-sdk: xcode
-
-.PHONY: xcode
-xcode:
+macos-sdk:
 	@echo "Please install the latest version of Xcode 26 and set the path for the active developer directory using \`sudo xcode-select -s <PATH_TO_XCODE>\`".
 
 .PHONY: clean