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