From 1ad2b66624e6b1285293a85b99d4cd900d263b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Gr=C3=A4nitz?= <stefan.graenitz@gmail.com>
Date: Tue, 15 Oct 2024 15:43:15 +0200
Subject: [PATCH] [lldb] Support even more swiftlang tests with nested make
 invocations on Windows (#9428)

(cherry picked from commit 977780e31fb0c512dedd503e67ed5d5c2f38d80a)
---
 lldb/test/API/lang/swift/clashing_abi_name/Makefile           | 4 ++--
 .../API/lang/swift/expression/error_missing_type/Makefile     | 2 +-
 lldb/test/API/lang/swift/import_spi/Makefile                  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lldb/test/API/lang/swift/clashing_abi_name/Makefile b/lldb/test/API/lang/swift/clashing_abi_name/Makefile
index 2237cdac0c039..553b52a209b66 100644
--- a/lldb/test/API/lang/swift/clashing_abi_name/Makefile
+++ b/lldb/test/API/lang/swift/clashing_abi_name/Makefile
@@ -7,11 +7,11 @@ all: libLibrary.dylib a.out
 include Makefile.rules
 
 libLibrary.dylib: Library.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=Library \
 		SWIFTFLAGS_EXTRAS="-I$(BUILDDIR) -enable-library-evolution -emit-library -emit-module -parse-as-library -module-abi-name a" \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 
 clean::
-	$(MAKE) BASENAME=Library VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
+	"$(MAKE)" BASENAME=Library VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
diff --git a/lldb/test/API/lang/swift/expression/error_missing_type/Makefile b/lldb/test/API/lang/swift/expression/error_missing_type/Makefile
index 8272b2ffbc43a..1879c567ae9aa 100644
--- a/lldb/test/API/lang/swift/expression/error_missing_type/Makefile
+++ b/lldb/test/API/lang/swift/expression/error_missing_type/Makefile
@@ -4,7 +4,7 @@ LD_EXTRAS = -lLibrary -L$(BUILDDIR)
 all: libLibrary.dylib a.out
 
 lib%.dylib: %.swift
-	$(MAKE) MAKE_DSYM=NO DYLIB_ONLY=YES \
+	"$(MAKE)" MAKE_DSYM=NO DYLIB_ONLY=YES \
 		DYLIB_HIDE_SWIFTMODULE=YES \
 		DYLIB_NAME=$(shell basename $< .swift) \
 		DYLIB_SWIFT_SOURCES=$(shell basename $<) \
diff --git a/lldb/test/API/lang/swift/import_spi/Makefile b/lldb/test/API/lang/swift/import_spi/Makefile
index 7bb7fa25c1aeb..325be6e6885c6 100644
--- a/lldb/test/API/lang/swift/import_spi/Makefile
+++ b/lldb/test/API/lang/swift/import_spi/Makefile
@@ -8,7 +8,7 @@ all: A.swiftmodule $(EXE)
 include Makefile.rules
 
 A.swiftmodule: $(SRCDIR)/A.swift B.swiftmodule
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=A \
 		DYLIB_SWIFT_SOURCES=A.swift \
@@ -17,7 +17,7 @@ A.swiftmodule: $(SRCDIR)/A.swift B.swiftmodule
 		LD_EXTRAS="-L$(BUILDDIR) -lB"
 
 B.swiftmodule: $(SRCDIR)/B.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=B \
 		DYLIB_SWIFT_SOURCES=B.swift \