Merge pull request #9428 from weliveindetail/lldb-test-nested-make-path-space-fix

[lldb] Support swiftlang tests with nested make invocations on Windows

Author: hjyamauchi

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)

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::

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

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::

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" \

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) \

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) \

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

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

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

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

lldb/test/API/lang/swift/clangimporter/missing_vfsoverlay/Makefile

@@ -11,15 +11,15 @@ 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)" \
 		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
 	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

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 \

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
 

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

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

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) \

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

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) \

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)" \

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 \

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,$@) \

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 \

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

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"

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)

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 \

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

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 \

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::

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
 

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
 

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 \

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 \

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= \

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 \