diff --git a/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/Makefile b/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/Makefile
index 63e421a97f7fb..ae3e371e3c4c8 100644
--- a/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/Makefile
+++ b/lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/Makefile
@@ -9,7 +9,7 @@ all: libinvisible.dylib $(EXE)
 include Makefile.rules
 
 libinvisible.dylib: Invisible.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		MAKE_DSYM=YES DYLIB_ONLY=YES DYLIB_NAME=Invisible \
 		DYLIB_SWIFT_SOURCES="Invisible.swift" \
 		SWIFTFLAGS_EXTRAS=-I$(BUILDDIR)
diff --git a/lldb/test/API/lang/swift/clangimporter/Werror/Makefile b/lldb/test/API/lang/swift/clangimporter/Werror/Makefile
index 5206d36a2fe25..75fc7160bd5d7 100644
--- a/lldb/test/API/lang/swift/clangimporter/Werror/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/Werror/Makefile
@@ -7,7 +7,7 @@ all: libDylib.dylib a.out
 include Makefile.rules
 
 libDylib.dylib: dylib.swift
-	$(MAKE) BASENAME=$(shell basename $< .swift) \
+	"$(MAKE)" BASENAME=$(shell basename $< .swift) \
 		-f $(SRCDIR)/dylib.mk all
 
 clean::
diff --git a/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/Makefile b/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/Makefile
index c655c19269ca3..c736fd5bdee00 100644
--- a/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/bridging_header_headermap/Makefile
@@ -18,7 +18,7 @@ all: libdylib.dylib a.out
 include Makefile.rules
 
 libdylib.dylib: dylib.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		DYLIB_NAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/clangimporter/config_macros/Makefile b/lldb/test/API/lang/swift/clangimporter/config_macros/Makefile
index 64bc1d03d31ab..141ba3e6d3469 100644
--- a/lldb/test/API/lang/swift/clangimporter/config_macros/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/config_macros/Makefile
@@ -7,7 +7,7 @@ all: libDylib.dylib a.out
 include Makefile.rules
 
 libDylib.dylib: dylib.swift
-	$(MAKE) BASENAME=$(shell basename $< .swift) \
+	"$(MAKE)" BASENAME=$(shell basename $< .swift) \
 		-f $(SRCDIR)/dylib.mk all
 
 clean::
diff --git a/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/Makefile b/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/Makefile
index 3c98181817f16..cd5fec5e6b810 100644
--- a/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/dynamic_type_resolution_import_conflict/Makefile
@@ -16,13 +16,13 @@ include Makefile.rules
 # make the conflict possible.
 
 libDylib.dylib: Dylib.swift
-	$(MAKE) MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 
 libConflict.dylib: Conflict.swift
-	$(MAKE) MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		SWIFTFLAGS_EXTRAS="-I. -Xcc -I$(SRCDIR)/hidden/Foo" \
diff --git a/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/Makefile b/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/Makefile
index e8bdc224de601..57133fc5f55ed 100644
--- a/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/explict_noimplicit/Makefile
@@ -9,7 +9,7 @@ include Makefile.rules
 
 libDylib: Dylib.swift
 	mkdir -p $(BUILDDIR)/$(shell basename $< .swift)
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		DYLIB_NAME=Dylib DYLIB_SWIFT_SOURCES=Dylib.swift \
 		VPATH=$(SRCDIR) SWIFTFLAGS_EXTRAS=-I$(SRCDIR) \
diff --git a/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/Makefile b/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/Makefile
index 63d8694cf8335..74513030fbac9 100644
--- a/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/hard_macro_conflict/Makefile
@@ -11,7 +11,7 @@ SWIFTFLAGS_EXTRAS=$(BAR_FLAGS) \
   -Xlinker -rpath -Xlinker $(BUILDDIR)
 
 Framework.framework: Framework.swift
-	$(MAKE) -f $(MAKEFILE_RULES) -C $(BUILDDIR) VPATH=$(VPATH) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) -C $(BUILDDIR) VPATH=$(VPATH) \
                 MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		DYLIB_NAME=$(shell basename $< .swift) \
diff --git a/lldb/test/API/lang/swift/clangimporter/headermap_conflict/Makefile b/lldb/test/API/lang/swift/clangimporter/headermap_conflict/Makefile
index afc7b8a7116ec..0fa602683afb4 100644
--- a/lldb/test/API/lang/swift/clangimporter/headermap_conflict/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/headermap_conflict/Makefile
@@ -14,7 +14,7 @@ all: libdylib.dylib a.out
 include Makefile.rules
 
 libdylib.dylib: dylib.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		DYLIB_NAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/clangimporter/include_conflict/Makefile b/lldb/test/API/lang/swift/clangimporter/include_conflict/Makefile
index e86c4d65b4ee5..7d8be2ab377b7 100644
--- a/lldb/test/API/lang/swift/clangimporter/include_conflict/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/include_conflict/Makefile
@@ -14,7 +14,7 @@ include Makefile.rules
 SWIFTFLAGS += -Xcc -I$(SRCDIR)/Bar -I. -Xcc -I$(SRCDIR)/Foo
 
 libdylib.dylib: dylib.swift
-	$(MAKE) MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		DYLIB_NAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/clangimporter/macro_conflict/Makefile b/lldb/test/API/lang/swift/clangimporter/macro_conflict/Makefile
index b8ff1e0a11289..053d81ef9d827 100644
--- a/lldb/test/API/lang/swift/clangimporter/macro_conflict/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/macro_conflict/Makefile
@@ -14,7 +14,7 @@ endif
 
 
 lib%.dylib: %.swift
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/clangimporter/missing_pch/Makefile b/lldb/test/API/lang/swift/clangimporter/missing_pch/Makefile
index aec68f538a957..298097089e9be 100644
--- a/lldb/test/API/lang/swift/clangimporter/missing_pch/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/missing_pch/Makefile
@@ -10,7 +10,7 @@ include Makefile.rules
 OVERLAY := $(BUILDDIR)/overlay.yaml
 lib%.dylib: %.swift
 	echo "struct S {};">$(BUILDDIR)/header.h
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 	        DISABLE_SWIFT_INTERFACE=YES \
@@ -20,7 +20,7 @@ lib%.dylib: %.swift
 	rm header*.pch
 
 clean::
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
diff --git a/lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/Makefile b/lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/Makefile
index 6274d53b688d7..f3ef329b879c5 100644
--- a/lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/Makefile
@@ -11,7 +11,7 @@ OVERLAY := $(BUILDDIR)/overlay.yaml
 lib%.dylib: %.swift
 	rm -f $(OVERLAY)
 	echo "{ 'version': 0, 'roots': [] }" >$(OVERLAY)
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		SWIFTFLAGS_EXTRAS="-Xcc -ivfsoverlay -Xcc $(OVERLAY)" \
@@ -19,7 +19,7 @@ lib%.dylib: %.swift
 	rm -f $(OVERLAY)
 
 clean::
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
diff --git a/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/Makefile b/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/Makefile
index 92384dc88c083..1729fe78ff87a 100644
--- a/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/objc_runtime_ivars/Makefile
@@ -6,7 +6,7 @@ all: aTestFramework.framework/Versions/A/aTestFramework a.out a.out.dSYM
 include Makefile.rules
 
 aTestFramework.framework/Versions/A/aTestFramework : aTestFramework.mm
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		MAKE_DSYM=YES DYLIB_ONLY=YES \
 		FRAMEWORK=aTestFramework DYLIB_CXX_SOURCES=aTestFramework.mm \
 		FRAMEWORK_HEADERS=$(SRCDIR)/aTestFramework.h \
diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile
index 6dd516b6f5a06..ad5c5a9472be1 100644
--- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile
@@ -13,7 +13,7 @@ endif
 
 lib%.dylib: %.swift
 	mkdir -p $(BUILDDIR)/$(shell basename $< .swift)
-	$(MAKE) MAKE_DSYM=YES \
+	"$(MAKE)" MAKE_DSYM=YES \
 		DYLIB_NAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 
diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/Makefile b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/Makefile
index 5f662b989b8aa..6f7bdb7229092 100644
--- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_bridging_headers/Makefile
@@ -13,7 +13,7 @@ endif
 
 lib%.dylib: %.swift
 	mkdir -p $(BUILDDIR)/$(shell basename $< .swift)
-	$(MAKE) MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES X=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		DYLIB_NAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/Makefile b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/Makefile
index 61dfa63659081..f31b5d8d9fad6 100644
--- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs_failing_import/Makefile
@@ -10,7 +10,7 @@ all: libFoo.dylib libBar.dylib a.out
 include Makefile.rules
 
 lib%.dylib: %.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/clangimporter/remap_sdk_path/Makefile b/lldb/test/API/lang/swift/clangimporter/remap_sdk_path/Makefile
index b19ec9ced6c6d..b26265ae01d70 100644
--- a/lldb/test/API/lang/swift/clangimporter/remap_sdk_path/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/remap_sdk_path/Makefile
@@ -11,7 +11,7 @@ $(EXE): $(SWIFT_SOURCES)
 	mkdir $(BUILDDIR)/LocalSDK
 	ln -s $(SDKROOT) $(BUILD_SDK)
 	echo "Building using SDK in build directory"
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		SDKROOT=$(BUILD_SDK) \
@@ -20,7 +20,7 @@ $(EXE): $(SWIFT_SOURCES)
 	echo "Sanity check that our SDK shenanigns worked"
 	dwarfdump -r 0 $(BUILDDIR)/main.swift.o | egrep 'DW_AT_LLVM_i?sysroot' | grep -q LocalSDK
 	echo "Linking with regular SDK (otherwise the linker complains)"
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		SDKROOT=$(SDKROOT) \
diff --git a/lldb/test/API/lang/swift/clangimporter/remoteast_import/Makefile b/lldb/test/API/lang/swift/clangimporter/remoteast_import/Makefile
index 5359f1fd1d94b..c6f1650b46ce1 100644
--- a/lldb/test/API/lang/swift/clangimporter/remoteast_import/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/remoteast_import/Makefile
@@ -13,7 +13,7 @@ LD_EXTRAS += -lLibrary -L.
 .PHONY: libLibrary
 
 libLibrary:
-	$(MAKE) -f $(SRCDIR)/Library.mk VPATH=$(SRCDIR) -I $(SRCDIR)
+	"$(MAKE)" -f $(SRCDIR)/Library.mk VPATH=$(SRCDIR) -I $(SRCDIR)
 
 clean::
 	rm -rf *.swiftmodule *.swiftdoc *.dSYM *~ lib*.dylib a.out *.o
diff --git a/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/Makefile b/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/Makefile
index edff78f605c85..6dceff675e382 100644
--- a/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/Makefile
+++ b/lldb/test/API/lang/swift/clangimporter/rewrite_clang_paths/Makefile
@@ -16,7 +16,7 @@ endif
 libFoo.dylib: Foo.swift
 	mkdir -p $(BOTDIR)
 	cp -r $(SRCDIR)/Foo $(BOTDIR)/
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		BOTDIR=$(BOTDIR) \
diff --git a/lldb/test/API/lang/swift/cross_module_extension/Makefile b/lldb/test/API/lang/swift/cross_module_extension/Makefile
index 9cf982bc4e663..d7a66b524b90d 100644
--- a/lldb/test/API/lang/swift/cross_module_extension/Makefile
+++ b/lldb/test/API/lang/swift/cross_module_extension/Makefile
@@ -9,14 +9,14 @@ include Makefile.rules
 
 
 libmoda.dylib: moda.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 
 
 libmodb.dylib: modb.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		LD_EXTRAS="-lmoda -L$(shell pwd)" \
diff --git a/lldb/test/API/lang/swift/cxx_interop/forward/langopt/Makefile b/lldb/test/API/lang/swift/cxx_interop/forward/langopt/Makefile
index 71bb34ee697c6..e01fcaadd914c 100644
--- a/lldb/test/API/lang/swift/cxx_interop/forward/langopt/Makefile
+++ b/lldb/test/API/lang/swift/cxx_interop/forward/langopt/Makefile
@@ -8,7 +8,7 @@ all: libDylib.dylib a.out
 include Makefile.rules
 
 libDylib.dylib: Dylib.swift
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		-f $(THIS_FILE_DIR)/Makefile.rules \
diff --git a/lldb/test/API/lang/swift/deployment_target/Makefile b/lldb/test/API/lang/swift/deployment_target/Makefile
index e59e557b74c2d..21c852fdbfbd6 100644
--- a/lldb/test/API/lang/swift/deployment_target/Makefile
+++ b/lldb/test/API/lang/swift/deployment_target/Makefile
@@ -12,14 +12,14 @@ a.out: main.swift libNewerTarget.dylib
 
 
 dlopen_module: dlopen_module.m libNewerTarget.dylib
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		CXX= \
 		OBJC_SOURCES=dlopen_module.m \
 		EXE=dlopen_module \
 		LD_EXTRAS="-framework Foundation -mmacos-version-min=10.8"
 
 lib%.dylib: %.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=$(patsubst lib%.dylib,%,$@) \
 		DYLIB_SWIFT_SOURCES=$(patsubst lib%.dylib,%.swift,$@) \
diff --git a/lldb/test/API/lang/swift/different_clang_flags/Makefile b/lldb/test/API/lang/swift/different_clang_flags/Makefile
index 3bb8308af4d5a..d6c010153922f 100644
--- a/lldb/test/API/lang/swift/different_clang_flags/Makefile
+++ b/lldb/test/API/lang/swift/different_clang_flags/Makefile
@@ -8,7 +8,7 @@ all: libmoda.dylib libmodb.dylib main
 include Makefile.rules
 
 lib%.dylib:
-	$(MAKE) -f $(MAKEFILE_RULES) VPATH=$(VPATH)/$*_dir \
+	"$(MAKE)" -f $(MAKEFILE_RULES) VPATH=$(VPATH)/$*_dir \
 		SWIFTFLAGS_EXTRAS=-I$(dir $<)/cdeps \
                 MAKE_DSYM=YES DYLIB_ONLY=YES \
 		DYLIB_NAME=$* DYLIB_SWIFT_SOURCES=$*.swift \
diff --git a/lldb/test/API/lang/swift/dwarfimporter/from_dylib/Makefile b/lldb/test/API/lang/swift/dwarfimporter/from_dylib/Makefile
index 2955603f01d04..5fcef78445875 100644
--- a/lldb/test/API/lang/swift/dwarfimporter/from_dylib/Makefile
+++ b/lldb/test/API/lang/swift/dwarfimporter/from_dylib/Makefile
@@ -7,4 +7,4 @@ all: libFoo.dylib $(EXE)
 include Makefile.rules
 
 libFoo.dylib: Foo.swift
-	$(MAKE) MAKE_DSYM=NO VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
+	"$(MAKE)" MAKE_DSYM=NO VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/dwarfimporter/objc-header/Makefile b/lldb/test/API/lang/swift/dwarfimporter/objc-header/Makefile
index 1943c52ba1bfc..fde0445410c1e 100644
--- a/lldb/test/API/lang/swift/dwarfimporter/objc-header/Makefile
+++ b/lldb/test/API/lang/swift/dwarfimporter/objc-header/Makefile
@@ -11,7 +11,7 @@ include Makefile.rules
 objc.o: libLibrary.dylib
 
 libLibrary.dylib: Library.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_SWIFT_SOURCES=Library.swift \
 		DYLIB_NAME=Library \
 		SWIFTFLAGS_EXTRAS="-emit-objc-header-path $(BUILDDIR)/include/Library-Swift.h"
diff --git a/lldb/test/API/lang/swift/expression/equality_operators/Makefile b/lldb/test/API/lang/swift/expression/equality_operators/Makefile
index 39f25971e0b15..3515678d121d2 100644
--- a/lldb/test/API/lang/swift/expression/equality_operators/Makefile
+++ b/lldb/test/API/lang/swift/expression/equality_operators/Makefile
@@ -8,7 +8,7 @@ all: libfooey.dylib three
 include Makefile.rules
 
 libfooey.dylib: one.swift two.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		MAKE_DSYM=YES DYLIB_ONLY=YES DYLIB_NAME=fooey \
 		DYLIB_SWIFT_SOURCES="one.swift two.swift" \
 		SWIFTFLAGS_EXTRAS=-I$(BUILDDIR)
diff --git a/lldb/test/API/lang/swift/expression/import_search_paths/Makefile b/lldb/test/API/lang/swift/expression/import_search_paths/Makefile
index 659294c6b3b43..30e352715f5d3 100644
--- a/lldb/test/API/lang/swift/expression/import_search_paths/Makefile
+++ b/lldb/test/API/lang/swift/expression/import_search_paths/Makefile
@@ -9,7 +9,7 @@ include Makefile.rules
 
 libHidden: $(SRCDIR)/hidden/Indirect.swift
 	mkdir -p $(BUILDDIR)/hidden
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		-C $(BUILDDIR)/hidden VPATH=$(SRCDIR)/hidden \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=Indirect \
@@ -19,7 +19,7 @@ libHidden: $(SRCDIR)/hidden/Indirect.swift
 		MAKE_DSYM=NO
 
 libDirect: $(SRCDIR)/Direct.swift libHidden
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=Direct \
 		DYLIB_SWIFT_SOURCES=Direct.swift \
diff --git a/lldb/test/API/lang/swift/expression/objc_context/Makefile b/lldb/test/API/lang/swift/expression/objc_context/Makefile
index d380b0da16102..5e67184c97bee 100644
--- a/lldb/test/API/lang/swift/expression/objc_context/Makefile
+++ b/lldb/test/API/lang/swift/expression/objc_context/Makefile
@@ -10,7 +10,7 @@ all: libFoo.dylib $(EXE)
 include Makefile.rules
 
 lib%.dylib: %.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
diff --git a/lldb/test/API/lang/swift/framework_paths/Makefile b/lldb/test/API/lang/swift/framework_paths/Makefile
index 4bf1792b853ea..dd3c30fe3f0dc 100644
--- a/lldb/test/API/lang/swift/framework_paths/Makefile
+++ b/lldb/test/API/lang/swift/framework_paths/Makefile
@@ -7,7 +7,7 @@ all: Direct.framework $(EXE)
 include Makefile.rules
 
 Discovered.framework: Discovered.h
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=Discovered \
 		DYLIB_OBJC_SOURCES=Discovered.m \
@@ -19,7 +19,7 @@ Direct.framework: $(SRCDIR)/Direct.swift.in Discovered.framework
 	mkdir -p $(BUILDDIR)/secret_path
 	cp $< $(BUILDDIR)/Direct.swift
 	mv Discovered.framework $(BUILDDIR)/secret_path
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_NAME=Direct \
 		DYLIB_SWIFT_SOURCES=Direct.swift \
 		DYLIB_MODULENAME=Direct \
diff --git a/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/Makefile b/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/Makefile
index d1d66d4470ad3..68b54ed5b7478 100644
--- a/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/Makefile
+++ b/lldb/test/API/lang/swift/implementation_only_imports/library_indirect/Makefile
@@ -7,11 +7,11 @@ all: clean SomeLibraryCore.swiftmodule SomeLibrary.swiftmodule a.out
 include Makefile.rules
 
 SomeLibraryCore.swiftmodule: SomeLibraryCore.swift
-	$(MAKE) BASENAME=$(shell basename $@ .swiftmodule) \
+	"$(MAKE)" BASENAME=$(shell basename $@ .swiftmodule) \
 		VPATH=$(SRCDIR) -f $(SRCDIR)/../dylib.mk all
 
 SomeLibrary.swiftmodule: SomeLibrary.swift SomeLibraryCore.swiftmodule
-	$(MAKE) BASENAME=$(shell basename $@ .swiftmodule) \
+	"$(MAKE)" BASENAME=$(shell basename $@ .swiftmodule) \
 		VPATH=$(SRCDIR) -f $(SRCDIR)/../dylib.mk all
 
 clean::
diff --git a/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/Makefile b/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/Makefile
index 839dbf23d506c..b2eb2ce814cca 100644
--- a/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/Makefile
+++ b/lldb/test/API/lang/swift/implementation_only_imports/library_resilient/Makefile
@@ -7,12 +7,12 @@ all: clean SomeLibraryCore.swiftmodule SomeLibrary.swiftmodule a.out
 include Makefile.rules
 
 SomeLibraryCore.swiftmodule: SomeLibraryCore.swift
-	$(MAKE) BASENAME=$(shell basename $@ .swiftmodule) \
+	"$(MAKE)" BASENAME=$(shell basename $@ .swiftmodule) \
 		SWIFTFLAGS_EXTRAS=-enable-library-evolution \
 		VPATH=$(SRCDIR) -f $(SRCDIR)/../dylib.mk all
 
 SomeLibrary.swiftmodule: SomeLibrary.swift SomeLibraryCore.swiftmodule
-	$(MAKE) BASENAME=$(shell basename $@ .swiftmodule) \
+	"$(MAKE)" BASENAME=$(shell basename $@ .swiftmodule) \
 		SWIFTFLAGS_EXTRAS=-enable-library-evolution \
 		VPATH=$(SRCDIR) -f $(SRCDIR)/../dylib.mk all
 
diff --git a/lldb/test/API/lang/swift/implementation_only_imports/main_executable/Makefile b/lldb/test/API/lang/swift/implementation_only_imports/main_executable/Makefile
index adb218cbc16c8..bdca5963fcfb6 100644
--- a/lldb/test/API/lang/swift/implementation_only_imports/main_executable/Makefile
+++ b/lldb/test/API/lang/swift/implementation_only_imports/main_executable/Makefile
@@ -8,7 +8,7 @@ all: clean SomeLibrary.swiftmodule a.out
 include Makefile.rules
 
 SomeLibrary.swiftmodule: SomeLibrary.swift
-	$(MAKE) BASENAME=$(shell basename $@ .swiftmodule) \
+	"$(MAKE)" BASENAME=$(shell basename $@ .swiftmodule) \
 		SWIFTFLAGS_EXTRAS=$(LIBRARY_SWIFTFLAGS_EXTRAS) \
 		VPATH=$(SRCDIR) -f $(SRCDIR)/../dylib.mk all
 
diff --git a/lldb/test/API/lang/swift/late_dylib/Makefile b/lldb/test/API/lang/swift/late_dylib/Makefile
index 7154acc9675b0..f1215e8ba547b 100644
--- a/lldb/test/API/lang/swift/late_dylib/Makefile
+++ b/lldb/test/API/lang/swift/late_dylib/Makefile
@@ -7,7 +7,7 @@ include Makefile.rules
 
 .PHONY: dylib
 dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		-f $(SRCDIR)/Makefile \
diff --git a/lldb/test/API/lang/swift/late_dylib_clangdeps/Makefile b/lldb/test/API/lang/swift/late_dylib_clangdeps/Makefile
index 615f09af4b8b0..8d8160028f499 100644
--- a/lldb/test/API/lang/swift/late_dylib_clangdeps/Makefile
+++ b/lldb/test/API/lang/swift/late_dylib_clangdeps/Makefile
@@ -7,7 +7,7 @@ include Makefile.rules
 
 .PHONY: dylib
 dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		-f $(SRCDIR)/Makefile \
diff --git a/lldb/test/API/lang/swift/late_expr_dylib/Makefile b/lldb/test/API/lang/swift/late_expr_dylib/Makefile
index 5772fe78b1a2f..830c2085c81f1 100644
--- a/lldb/test/API/lang/swift/late_expr_dylib/Makefile
+++ b/lldb/test/API/lang/swift/late_expr_dylib/Makefile
@@ -7,7 +7,7 @@ include Makefile.rules
 
 .PHONY: Dylib
 Dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		SWIFT_SOURCES= \
diff --git a/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/Makefile b/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/Makefile
index b2179bc504e05..6323dc5457eec 100644
--- a/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/Makefile
+++ b/lldb/test/API/lang/swift/late_swift_dylib_clangdeps/Makefile
@@ -11,7 +11,7 @@ include Makefile.rules
 
 .PHONY: dylib
 dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		-f $(SRCDIR)/Makefile \
diff --git a/lldb/test/API/lang/swift/lazy_framework/Makefile b/lldb/test/API/lang/swift/lazy_framework/Makefile
index c24340f57d209..fce63dd5c4b67 100644
--- a/lldb/test/API/lang/swift/lazy_framework/Makefile
+++ b/lldb/test/API/lang/swift/lazy_framework/Makefile
@@ -7,7 +7,7 @@ all: Lazy.framework $(EXE)
 include Makefile.rules
 
 Lazy.framework: $(SRCDIR)/Lazy.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_NAME=Lazy \
 		DYLIB_SWIFT_SOURCES=Lazy.swift \
 		DYLIB_MODULENAME=Lazy \
diff --git a/lldb/test/API/lang/swift/macro/Makefile b/lldb/test/API/lang/swift/macro/Makefile
index 17c715922f491..a1960248d388f 100644
--- a/lldb/test/API/lang/swift/macro/Makefile
+++ b/lldb/test/API/lang/swift/macro/Makefile
@@ -12,7 +12,7 @@ all: libMacro.dylib libMacroImpl.dylib $(EXE)
 include Makefile.rules
 
 libMacro.dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		-f $(THIS_FILE_DIR)/Makefile.rules \
@@ -25,7 +25,7 @@ libMacro.dylib:
 	$(RM) $(BUILDDIR)/Macro.swiftinterface
 
 libMacroImpl.dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		-f $(THIS_FILE_DIR)/Makefile.rules \
diff --git a/lldb/test/API/lang/swift/module_search_paths/Makefile b/lldb/test/API/lang/swift/module_search_paths/Makefile
index 78327a2442871..0c4a6739eca5a 100644
--- a/lldb/test/API/lang/swift/module_search_paths/Makefile
+++ b/lldb/test/API/lang/swift/module_search_paths/Makefile
@@ -5,5 +5,5 @@ include Makefile.rules
 
 # This is an extra dependency that does NOT get linked into the EXE.
 module-build:
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		SWIFT_SOURCES=module.swift EXE=Module
diff --git a/lldb/test/API/lang/swift/optional_of_resilient/Makefile b/lldb/test/API/lang/swift/optional_of_resilient/Makefile
index 5b5dadc5c0479..81f44bab16e2f 100644
--- a/lldb/test/API/lang/swift/optional_of_resilient/Makefile
+++ b/lldb/test/API/lang/swift/optional_of_resilient/Makefile
@@ -7,7 +7,7 @@ LD_EXTRAS = -lmod -L$(BUILDDIR)
 SWIFTFLAGS_EXTRAS = -I$(BUILDDIR)
 
 libmod.dylib: mod.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=mod \
 		SWIFTFLAGS_EXTRAS="-I$(BUILDDIR) -enable-library-evolution" \
diff --git a/lldb/test/API/lang/swift/other_arch_dylib/Makefile b/lldb/test/API/lang/swift/other_arch_dylib/Makefile
index 6993083dbd327..8edee59875cf3 100644
--- a/lldb/test/API/lang/swift/other_arch_dylib/Makefile
+++ b/lldb/test/API/lang/swift/other_arch_dylib/Makefile
@@ -7,7 +7,7 @@ include Makefile.rules
 
 OtherArch.framework/Versions/A/OtherArch: $(SRCDIR)/OtherArch.swift
 	touch OtherArch.h
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 	    MAKE_DSYM=YES \
 		DYLIB_ONLY=YES \
 		DYLIB_SWIFT_SOURCES=OtherArch.swift \
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/dsym/Makefile b/lldb/test/API/lang/swift/parseable_interfaces/dsym/Makefile
index 62f1dff755e7b..6bfa28ac479a5 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/dsym/Makefile
+++ b/lldb/test/API/lang/swift/parseable_interfaces/dsym/Makefile
@@ -17,7 +17,7 @@ setup:
 	cp $(SRCDIR)/libs/A.swift libs/AA.swift
 
 sharedA:
-	$(MAKE) MAKE_DSYM=$(DYLIB_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(DYLIB_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) VPATH=$(BUILDDIR) SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		DSYMUTIL=$(DSYMUTIL) \
@@ -31,6 +31,6 @@ clear_modules:
 	rm -rf cache
 
 clean::
-	$(MAKE) VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=AA -f $(SRCDIR)/libs/Makefile clean
+	"$(MAKE)" VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=AA -f $(SRCDIR)/libs/Makefile clean
 	rm -rf libs
 	rm -rf cache
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/shared/Makefile b/lldb/test/API/lang/swift/parseable_interfaces/shared/Makefile
index 98c8b7dbc1db3..22062ed8378f9 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/shared/Makefile
+++ b/lldb/test/API/lang/swift/parseable_interfaces/shared/Makefile
@@ -23,19 +23,19 @@ setup:
 	echo $(SWIFTSDKROOT) > $(BUILDDIR)/sdk-root.txt
 
 sharedA:
-	$(MAKE) MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		BASENAME=AA -f $(SRCDIR)/libs/Makefile
 
 sharedB:
-	$(MAKE) MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		BASENAME=BB SWIFTFLAGS_EXTRAS="-I$(BUILDDIR)" LD_EXTRAS="-L$(BUILDDIR) -lAA" -f $(SRCDIR)/libs/Makefile
 
 sharedC:
-	$(MAKE) MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		BASENAME=CC -f $(SRCDIR)/libs/Makefile
@@ -48,9 +48,9 @@ clear_modules:
 	rm -rf MCP
 
 clean::
-	$(MAKE) VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=AA -f $(SRCDIR)/libs/Makefile clean
-	$(MAKE) VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=BB -f $(SRCDIR)/libs/Makefile clean
-	$(MAKE) VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=CC -f $(SRCDIR)/libs/Makefile clean
+	"$(MAKE)" VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=AA -f $(SRCDIR)/libs/Makefile clean
+	"$(MAKE)" VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=BB -f $(SRCDIR)/libs/Makefile clean
+	"$(MAKE)" VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=CC -f $(SRCDIR)/libs/Makefile clean
 	rm -rf libs
 	rm -rf MCP
 	rm -f sdk-root.txt
diff --git a/lldb/test/API/lang/swift/parseable_interfaces/static/Makefile b/lldb/test/API/lang/swift/parseable_interfaces/static/Makefile
index 313388ff282dc..6df9ad5232123 100644
--- a/lldb/test/API/lang/swift/parseable_interfaces/static/Makefile
+++ b/lldb/test/API/lang/swift/parseable_interfaces/static/Makefile
@@ -20,14 +20,14 @@ setup:
 staticA:
 	# Because we override VPATH to point to the build directory, we need to pass
 	# down SWIFTC too (it's default value is relative to VPATH)
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) \
 		SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
 		BASENAME=AA -f $(SRCDIR)/libs/Makefile static_only
 
 staticB:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) \
 		SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
@@ -35,7 +35,7 @@ staticB:
 		LD_EXTRAS="-L$(BUILDDIR)" -f $(SRCDIR)/libs/Makefile static_only
 
 staticC:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) VPATH=$(BUILDDIR) \
 		SWIFTSDKROOT=$(SWIFTSDKROOT) \
 		SWIFT_MODULE_CACHE_FLAGS="$(SWIFT_MODULE_CACHE_FLAGS)" \
@@ -49,8 +49,8 @@ clear_modules:
 	rm -rf MCP
 
 clean::
-	$(MAKE) VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=AA -f $(SRCDIR)/libs/Makefile clean
-	$(MAKE) VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=BB -f $(SRCDIR)/libs/Makefile clean
-	$(MAKE) VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=CC -f $(SRCDIR)/libs/Makefile clean
+	"$(MAKE)" VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=AA -f $(SRCDIR)/libs/Makefile clean
+	"$(MAKE)" VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=BB -f $(SRCDIR)/libs/Makefile clean
+	"$(MAKE)" VPATH=$(BUILDDIR) SWIFTC=$(SWIFTC) BASENAME=CC -f $(SRCDIR)/libs/Makefile clean
 	rm -rf libs
 	rm -rf MCP
diff --git a/lldb/test/API/lang/swift/path_with_colons/Makefile b/lldb/test/API/lang/swift/path_with_colons/Makefile
index 3cae9b078aa32..a130a496ceab7 100644
--- a/lldb/test/API/lang/swift/path_with_colons/Makefile
+++ b/lldb/test/API/lang/swift/path_with_colons/Makefile
@@ -1,2 +1,2 @@
 all:
-	$(MAKE) -C "pro:ject"
+	"$(MAKE)" -C "pro:ject"
diff --git a/lldb/test/API/lang/swift/playgrounds-repl/Makefile.common b/lldb/test/API/lang/swift/playgrounds-repl/Makefile.common
index 9899eac343396..80c8599fbcde7 100644
--- a/lldb/test/API/lang/swift/playgrounds-repl/Makefile.common
+++ b/lldb/test/API/lang/swift/playgrounds-repl/Makefile.common
@@ -11,7 +11,7 @@ include Makefile.rules
 
 ifneq ($(MAKECMDGOALS),libPlaygroundsRuntime.dylib)
 libPlaygroundsRuntime.dylib: PlaygroundsRuntime.swift
-	$(MAKE) -C $(BUILDDIR) -f $(SRCDIR)/Makefile \
+	"$(MAKE)" -C $(BUILDDIR) -f $(SRCDIR)/Makefile \
 		SWIFT_SOURCES= DYLIB_SWIFT_SOURCES=PlaygroundsRuntime.swift \
 		DYLIB_NAME=PlaygroundsRuntime libPlaygroundsRuntime.dylib
 endif
diff --git a/lldb/test/API/lang/swift/playgrounds/Makefile b/lldb/test/API/lang/swift/playgrounds/Makefile
index ed13c7d75a21c..6f19e462aca64 100644
--- a/lldb/test/API/lang/swift/playgrounds/Makefile
+++ b/lldb/test/API/lang/swift/playgrounds/Makefile
@@ -11,12 +11,12 @@ PlaygroundStub: libPlaygroundsRuntime.dylib Dylib.framework
 include Makefile.rules
 
 libPlaygroundsRuntime.dylib: PlaygroundsRuntime.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_SWIFT_SOURCES=PlaygroundsRuntime.swift \
 		DYLIB_NAME=PlaygroundsRuntime
 
 Dylib.framework: Dylib.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		FRAMEWORK=Dylib \
 		DYLIB_SWIFT_SOURCES=Dylib.swift \
 		DYLIB_NAME=Dylib \
diff --git a/lldb/test/API/lang/swift/private_discriminator/Makefile b/lldb/test/API/lang/swift/private_discriminator/Makefile
index 0535e2269d7c0..b24fadf15251f 100644
--- a/lldb/test/API/lang/swift/private_discriminator/Makefile
+++ b/lldb/test/API/lang/swift/private_discriminator/Makefile
@@ -7,7 +7,7 @@ all: libBuilder.dylib $(EXE)
 include Makefile.rules
 
 libGeneric.dylib: $(SRCDIR)/Generic.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=Generic \
 		DYLIB_SWIFT_SOURCES=Generic.swift \
@@ -15,7 +15,7 @@ libGeneric.dylib: $(SRCDIR)/Generic.swift
 		SWIFTFLAGS_EXTRAS=-enable-library-evolution
 
 libBuilder.dylib: $(SRCDIR)/Builder.swift libGeneric.dylib
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=Builder \
 		DYLIB_SWIFT_SOURCES=Builder.swift \
diff --git a/lldb/test/API/lang/swift/private_generic_type/Makefile b/lldb/test/API/lang/swift/private_generic_type/Makefile
index 967989630d929..97778576e84a9 100644
--- a/lldb/test/API/lang/swift/private_generic_type/Makefile
+++ b/lldb/test/API/lang/swift/private_generic_type/Makefile
@@ -7,7 +7,7 @@ LD_EXTRAS = -lPublic -lPrivate -L$(BUILDDIR)
 SWIFTFLAGS_EXTRAS = -I$(BUILDDIR)
 
 libPrivate.dylib: Private.swift
-	$(MAKE) MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=Private \
 		LD_EXTRAS="-lPublic -L$(BUILDDIR)" \
@@ -18,7 +18,7 @@ libPrivate.dylib: Private.swift
 		-f $(MAKEFILE_RULES)
 
 libPublic.dylib: Public.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=Public \
 		SWIFTFLAGS_EXTRAS="-I$(BUILDDIR)" \
@@ -28,7 +28,7 @@ libPublic.dylib: Public.swift
 		-f $(MAKEFILE_RULES)
 
 clean::
-	$(MAKE) BASENAME=Private VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
-	$(MAKE) BASENAME=Public VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
+	"$(MAKE)" BASENAME=Private VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
+	"$(MAKE)" BASENAME=Public VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
 
 
diff --git a/lldb/test/API/lang/swift/private_import/Makefile b/lldb/test/API/lang/swift/private_import/Makefile
index 9e43b57e29e25..bba5f527e618b 100644
--- a/lldb/test/API/lang/swift/private_import/Makefile
+++ b/lldb/test/API/lang/swift/private_import/Makefile
@@ -7,13 +7,13 @@ LD_EXTRAS = -lLibrary -L$(BUILDDIR)
 SWIFTFLAGS_EXTRAS = -I$(BUILDDIR)
 
 libInvisible.dylib: Invisible.swift
-	$(MAKE) MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=NO CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=Invisible DEBUG_INFO_FLAG=-gnone \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 
 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 \
 		LD_EXTRAS="-lInvisible -L$(BUILDDIR)" \
@@ -21,5 +21,5 @@ libLibrary.dylib: Library.swift
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 
 clean::
-	$(MAKE) BASENAME=Invisible VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
-	$(MAKE) BASENAME=Library VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
+	"$(MAKE)" BASENAME=Invisible 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/reflection_loading/Makefile b/lldb/test/API/lang/swift/reflection_loading/Makefile
index ff2d0cdfbf696..4b00bf66bdb32 100644
--- a/lldb/test/API/lang/swift/reflection_loading/Makefile
+++ b/lldb/test/API/lang/swift/reflection_loading/Makefile
@@ -9,7 +9,7 @@ all: dylib $(EXE)
 
 include Makefile.rules
 dylib: lib.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		MAKE_DSYM=YES DYLIB_ONLY=YES DYLIB_NAME=dynamic_lib \
 		DYLIB_SWIFT_SOURCES="lib.swift" \
 		SWIFTFLAGS_EXTRAS="-I$(BUILDDIR) $(SWIFTFLAGS_EXTRAS)"
diff --git a/lldb/test/API/lang/swift/reflection_only/Makefile b/lldb/test/API/lang/swift/reflection_only/Makefile
index 2bb8804503881..e3dd056b38b74 100644
--- a/lldb/test/API/lang/swift/reflection_only/Makefile
+++ b/lldb/test/API/lang/swift/reflection_only/Makefile
@@ -10,7 +10,7 @@ all: dylib $(EXE)
 
 include Makefile.rules
 dylib: lib.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		MAKE_DSYM=YES DYLIB_ONLY=YES DYLIB_NAME=dynamic_lib \
 		DYLIB_SWIFT_SOURCES="lib.swift" \
 		DYLIB_HIDE_SWIFTMODULE=YES \
diff --git a/lldb/test/API/lang/swift/resilience/Makefile b/lldb/test/API/lang/swift/resilience/Makefile
index 4d71d20270a83..4836a56867967 100644
--- a/lldb/test/API/lang/swift/resilience/Makefile
+++ b/lldb/test/API/lang/swift/resilience/Makefile
@@ -6,7 +6,7 @@ include Makefile.rules
 libmod.%.dylib: mod.%.swift
 	ln -sf $< mod.swift
 	$(SWIFTC) $(SWIFTFLAGS) -emit-module -module-name mod mod.swift -emit-library -o $@ -Xlinker -install_name -Xlinker @executable_path/libmod.$*.dylib -###
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		DYLIB_NAME=mod \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
@@ -22,7 +22,7 @@ main.%: main.swift
 	ln -sf libmod.$*.dylib.dSYM libmod.dylib.dSYM
 	ln -sf mod.$*.swiftdoc mod.swiftdoc
 	ln -sf mod.$*.swiftinterface mod.swiftinterface
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/exe.mk all
 	mv main main.$*
diff --git a/lldb/test/API/lang/swift/static_framework/Makefile b/lldb/test/API/lang/swift/static_framework/Makefile
index c5752eaf52e27..6fb56547e7c4a 100644
--- a/lldb/test/API/lang/swift/static_framework/Makefile
+++ b/lldb/test/API/lang/swift/static_framework/Makefile
@@ -9,7 +9,7 @@ all: $(FRAMEWORKS) dylib $(EXE)
 include Makefile.rules
 
 lib%.a: %.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_NAME=static \
 		SWIFT_SOURCES=$(patsubst lib%.a,%.swift,$@) \
 		MODULENAME=$(patsubst lib%.a,%,$@) \
@@ -28,7 +28,7 @@ lib%.a: %.swift
 	mv $(BUILDDIR)/$(patsubst lib%.a,%.swiftinterface,$<) $(BUILDDIR)/$@/Modules/
 
 dylib: Dylib.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_NAME=Dylib \
 		DYLIB_SWIFT_SOURCES=Dylib.swift \
 		DYLIB_MODULENAME=Dylib \
diff --git a/lldb/test/API/lang/swift/static_linking/macOS/Makefile b/lldb/test/API/lang/swift/static_linking/macOS/Makefile
index 2ffb8ad38fcad..bbceb5c43dc28 100755
--- a/lldb/test/API/lang/swift/static_linking/macOS/Makefile
+++ b/lldb/test/API/lang/swift/static_linking/macOS/Makefile
@@ -23,7 +23,7 @@ ifneq "$(CODESIGN)" ""
 endif
 
 %.swift.o: %.swift
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_NAME=$(patsubst %.swift.o,%,$@) \
 		SWIFT_SOURCES=$(patsubst %.swift.o,%.swift,$@) \
 		SWIFT_OBJC_HEADER=$(patsubst %.swift.o,%-swift.h,$@) \
diff --git a/lldb/test/API/lang/swift/swift_version/Makefile b/lldb/test/API/lang/swift/swift_version/Makefile
index da1b11f66cfa9..41a3b6840ccd0 100644
--- a/lldb/test/API/lang/swift/swift_version/Makefile
+++ b/lldb/test/API/lang/swift/swift_version/Makefile
@@ -11,7 +11,7 @@ MOD5_FLAGS = -swift-version 5
 MOD4_FLAGS = -swift-version 4
 
 libmod%.dylib: mod%.swift
-	$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
 		SWIFTFLAGS_EXTRAS="$(MOD$*_FLAGS)" \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		BASENAME=$(shell basename $< .swift) \
diff --git a/lldb/test/API/lang/swift/typealias/Makefile b/lldb/test/API/lang/swift/typealias/Makefile
index 361f391d1e95b..4cdc7f1a6d3b7 100644
--- a/lldb/test/API/lang/swift/typealias/Makefile
+++ b/lldb/test/API/lang/swift/typealias/Makefile
@@ -8,7 +8,7 @@ include Makefile.rules
 
 .PHONY: dylib
 dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) \
 		-f $(THIS_FILE_DIR)/Makefile.rules \
diff --git a/lldb/test/API/lang/swift/unit-tests/Makefile b/lldb/test/API/lang/swift/unit-tests/Makefile
index 039b53094d65d..cd208655b3f05 100644
--- a/lldb/test/API/lang/swift/unit-tests/Makefile
+++ b/lldb/test/API/lang/swift/unit-tests/Makefile
@@ -6,11 +6,11 @@ include Makefile.rules
 
 .PHONY: dylib
 dylib:
-	$(MAKE) MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
 		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 
 clean::
 	rm -rf *.o *.dSYM *.dylib *.swiftdoc *.swiftmodule *.xctest xctest
-	$(MAKE) VPATH=$(SRCDIR) -f $(SRCDIR)/dylib.mk clean
+	"$(MAKE)" VPATH=$(SRCDIR) -f $(SRCDIR)/dylib.mk clean
 
diff --git a/lldb/test/API/repl/cpp_exceptions/Makefile b/lldb/test/API/repl/cpp_exceptions/Makefile
index 764b51d406993..0ace69cd18b2b 100644
--- a/lldb/test/API/repl/cpp_exceptions/Makefile
+++ b/lldb/test/API/repl/cpp_exceptions/Makefile
@@ -8,7 +8,7 @@ include Makefile.rules
 
 libCppLib.dylib: CppLib/CppLib.cpp
 	mkdir -p CppLib
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_NAME=CppLib DYLIB_ONLY=YES CXXFLAGS_EXTRAS=-fPIC \
 		DYLIB_CXX_SOURCES="CppLib/CppLib.cpp CppLib/CppLibWrapper.cpp"
 	install_name_tool -id $@ $@
@@ -17,7 +17,7 @@ ifneq "$(CODESIGN)" ""
 endif
 
 libWrapper.dylib: libCppLib.dylib
-	$(MAKE) -f $(MAKEFILE_RULES) \
+	"$(MAKE)" -f $(MAKEFILE_RULES) \
 		DYLIB_NAME=Wrapper DYLIB_SWIFT_SOURCES=wrapper.swift \
 		LD_EXTRAS="$(LD_EXTRAS)" \
 		SWIFTFLAGS_EXTRAS="-I$(SRCDIR) -L. -lCppLib -module-link-name Wrapper"