Skip to content

Commit 8ff38c7

Browse files
JDevlieghereJDevlieghere
authored
Merge pull request #9513 from weliveindetail/lldb-tests-20240723
Allow Swift to enable LLDB tests in Windows CI
2 parents 1ecc38e + 0da07d6 commit 8ff38c7

File tree

69 files changed

+152
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+152
-100
lines changed

‎lldb/bindings/python/CMakeLists.txt

+18
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,24 @@ function(finish_swig_python swig_target lldb_python_bindings_dir lldb_python_tar
198198
COMMENT "Copying Python DLL to LLDB binaries directory.")
199199
endif()
200200

201+
# Since Python3.8 the Windows runtime loads dependent DLLs only from the directory of the binary
202+
# itself (and not Path). Windows has no RPATHs, so we must copy all DLLs that we depend on into
203+
# the Python package.
204+
if (WIN32)
205+
# TARGET_RUNTIME_DLLS is supported in CMake 3.21+
206+
if ("${CMAKE_VERSION}" VERSION_LESS "3.21.0")
207+
if (LLDB_INCLUDE_TESTS)
208+
message(SEND_ERROR
209+
"Your CMake version is ${CMAKE_VERSION}. In order to run LLDB tests "
210+
"on Windows please upgrade to 3.21.0 at least (or disable tests with "
211+
"LLDB_INCLUDE_TESTS=Off)")
212+
endif()
213+
else()
214+
add_custom_command(TARGET ${swig_target} POST_BUILD
215+
COMMAND ${CMAKE_COMMAND} -E copy -t ${lldb_python_target_dir} $<TARGET_RUNTIME_DLLS:liblldb>
216+
COMMAND_EXPAND_LISTS)
217+
endif()
218+
endif()
201219

202220
endfunction()
203221

‎lldb/packages/Python/lldbsuite/test/dotest.py

-4
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,6 @@ def parseOptionsAndInitTestdirs():
268268

269269
if args.make:
270270
configuration.make_path = args.make
271-
elif platform_system == "FreeBSD" or platform_system == "NetBSD":
272-
configuration.make_path = "gmake"
273-
else:
274-
configuration.make_path = "make"
275271

276272
if args.dsymutil:
277273
configuration.dsymutil = args.dsymutil

‎lldb/test/API/CMakeLists.txt

+15
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,20 @@ set(LLDB_DEFAULT_TEST_EXECUTABLE "${LLVM_RUNTIME_OUTPUT_INTDIR}/lldb${CMAKE_EXEC
6565

6666
set(LLDB_DEFAULT_TEST_DSYMUTIL "${LLVM_TOOLS_BINARY_DIR}/dsymutil${CMAKE_EXECUTABLE_SUFFIX}")
6767

68+
if(LLDB_TEST_MAKE)
69+
set(LLDB_DEFAULT_TEST_MAKE ${LLDB_TEST_MAKE})
70+
else()
71+
find_program(LLDB_DEFAULT_TEST_MAKE make gmake)
72+
if(LLDB_DEFAULT_TEST_MAKE)
73+
message(STATUS "Found make: ${LLDB_DEFAULT_TEST_MAKE}")
74+
else()
75+
message(STATUS "Not found: make")
76+
message(WARNING
77+
"Many LLDB API tests require 'make' tool. Please provide it in Path "
78+
"or pass via LLDB_TEST_MAKE.")
79+
endif()
80+
endif()
81+
6882
if (TARGET clang)
6983
set(LLDB_DEFAULT_TEST_COMPILER "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}")
7084
else()
@@ -74,6 +88,7 @@ endif()
7488
set(LLDB_TEST_EXECUTABLE "${LLDB_DEFAULT_TEST_EXECUTABLE}" CACHE PATH "lldb executable used for testing")
7589
set(LLDB_TEST_COMPILER "${LLDB_DEFAULT_TEST_COMPILER}" CACHE PATH "C Compiler to use for building LLDB test inferiors")
7690
set(LLDB_TEST_DSYMUTIL "${LLDB_DEFAULT_TEST_DSYMUTIL}" CACHE PATH "dsymutil used for generating dSYM bundles")
91+
set(LLDB_TEST_MAKE "${LLDB_DEFAULT_TEST_MAKE}" CACHE PATH "make tool used for building test executables")
7792

7893
if ("${LLDB_TEST_COMPILER}" STREQUAL "")
7994
message(FATAL_ERROR "LLDB test compiler not specified. Tests will not run.")

‎lldb/test/API/commands/expression/top-level/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ all: dummy
55
include Makefile.rules
66

77
dummy: dummy.cpp
8-
$(MAKE) -f $(MAKEFILE_RULES) \
8+
"$(MAKE)" -f $(MAKEFILE_RULES) \
99
CXX_SOURCES=dummy.cpp EXE=dummy
1010

‎lldb/test/API/commands/expression/weak_symbols/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ a.out: libdylib.dylib
99
include Makefile.rules
1010

1111
libdylib.dylib: dylib.c
12-
$(MAKE) -C $(BUILDDIR) -f $(MAKEFILE_RULES) \
12+
"$(MAKE)" -C $(BUILDDIR) -f $(MAKEFILE_RULES) \
1313
C_SOURCES= DYLIB_C_SOURCES=dylib.c DYLIB_NAME=dylib \
1414
CFLAGS_EXTRAS=-DHAS_THEM LD_EXTRAS=-dynamiclib
1515

1616
hidden/libdylib.dylib:
1717
mkdir hidden
18-
$(MAKE) -C $(BUILDDIR)/hidden -f $(MAKEFILE_RULES) \
18+
"$(MAKE)" -C $(BUILDDIR)/hidden -f $(MAKEFILE_RULES) \
1919
C_SOURCES= DYLIB_C_SOURCES=dylib.c DYLIB_NAME=dylib \
2020
LD_EXTRAS=-dynamiclib

‎lldb/test/API/commands/target/create-deps/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ a.out: libload_a
66
include Makefile.rules
77

88
libload_a:
9-
$(MAKE) -f $(MAKEFILE_RULES) \
9+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1010
DYLIB_ONLY=YES DYLIB_NAME=load_a DYLIB_CXX_SOURCES=a.cpp

‎lldb/test/API/functionalities/breakpoint/break_in_loaded_dylib/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CXX_SOURCES := main.cpp
22
USE_LIBDL := 1
33

44
lib_b:
5-
$(MAKE) -f $(MAKEFILE_RULES) \
5+
"$(MAKE)" -f $(MAKEFILE_RULES) \
66
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=b.cpp DYLIB_NAME=lib_b
77
all: lib_b
88

‎lldb/test/API/functionalities/completion/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ USE_LIBDL := 1
44
a.out: lib_shared
55

66
lib_shared:
7-
$(MAKE) -f $(MAKEFILE_RULES) \
7+
"$(MAKE)" -f $(MAKEFILE_RULES) \
88
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=shared.cpp DYLIB_NAME=shared
99

1010
include Makefile.rules

‎lldb/test/API/functionalities/dlopen_other_executable/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ C_SOURCES := main.c
22
USE_LIBDL := 1
33

44
other:
5-
$(MAKE) -f $(MAKEFILE_RULES) C_SOURCES=other.c EXE=other
5+
"$(MAKE)" -f $(MAKEFILE_RULES) C_SOURCES=other.c EXE=other
66
all: other
77

88
include Makefile.rules

‎lldb/test/API/functionalities/exec/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ all: secondprog
55
include Makefile.rules
66

77
secondprog: secondprog.cpp
8-
$(MAKE) -f $(MAKEFILE_RULES) \
8+
"$(MAKE)" -f $(MAKEFILE_RULES) \
99
CXX_SOURCES=secondprog.cpp EXE=secondprog

‎lldb/test/API/functionalities/jitloader_gdb/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ all: a.out simple
55
include Makefile.rules
66

77
simple:
8-
$(MAKE) -f $(MAKEFILE_RULES) \
8+
"$(MAKE)" -f $(MAKEFILE_RULES) \
99
C_SOURCES=simple.c EXE=simple

‎lldb/test/API/functionalities/limit-debug-info/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ include Makefile.rules
1717
a.out: libone libtwo
1818

1919
libone:
20-
$(MAKE) -f $(MAKEFILE_RULES) \
20+
"$(MAKE)" -f $(MAKEFILE_RULES) \
2121
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=one.cpp DYLIB_NAME=one \
2222
CFLAGS_EXTRAS="$(ONE_CXXFLAGS)"
2323

2424
libtwo: libone
25-
$(MAKE) -f $(MAKEFILE_RULES) \
25+
"$(MAKE)" -f $(MAKEFILE_RULES) \
2626
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=two.cpp DYLIB_NAME=two \
2727
CFLAGS_EXTRAS="$(TWO_CXXFLAGS)" LD_EXTRAS="-L. -lone"

‎lldb/test/API/functionalities/load_after_attach/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CXX_SOURCES := main.cpp
22
USE_LIBDL := 1
33

44
lib_b:
5-
$(MAKE) -f $(MAKEFILE_RULES) \
5+
"$(MAKE)" -f $(MAKEFILE_RULES) \
66
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=b.cpp DYLIB_NAME=lib_b
77
all: lib_b
88

‎lldb/test/API/functionalities/load_lazy/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ else
1717
endif
1818

1919
t1: t2_0
20-
$(MAKE) VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
20+
"$(MAKE)" VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
2121
DYLIB_ONLY=YES DYLIB_C_SOURCES=t1.c DYLIB_NAME=t1 LD_EXTRAS="-L. $(LINKFLAGS)"
2222

2323
t2_0:
24-
$(MAKE) VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
24+
"$(MAKE)" VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
2525
DYLIB_ONLY=YES DYLIB_C_SOURCES=t2_0.c DYLIB_NAME=t2_0
2626

2727
t2_1:
28-
$(MAKE) VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
28+
"$(MAKE)" VPATH=$(SRCDIR) -f $(MAKEFILE_RULES) \
2929
DYLIB_ONLY=YES DYLIB_C_SOURCES=t2_1.c DYLIB_NAME=t2_1

‎lldb/test/API/functionalities/load_unload/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ a.out: lib_b lib_a lib_c lib_d hidden_lib_d
77
include Makefile.rules
88

99
lib_a: lib_b
10-
$(MAKE) -f $(MAKEFILE_RULES) \
10+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1111
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=a.cpp DYLIB_NAME=loadunload_a \
1212
LD_EXTRAS="-L. -lloadunload_b"
1313

1414
lib_b:
15-
$(MAKE) -f $(MAKEFILE_RULES) \
15+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1616
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=b.cpp DYLIB_NAME=loadunload_b
1717

1818
lib_c:
19-
$(MAKE) -f $(MAKEFILE_RULES) \
19+
"$(MAKE)" -f $(MAKEFILE_RULES) \
2020
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=c.cpp DYLIB_NAME=loadunload_c
2121

2222
lib_d:
23-
$(MAKE) -f $(MAKEFILE_RULES) \
23+
"$(MAKE)" -f $(MAKEFILE_RULES) \
2424
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=loadunload_d
2525
ifeq ($(OS),Darwin)
2626
install_name_tool -id @executable_path/libloadunload_d.dylib libloadunload_d.dylib
2727
endif
2828

2929
hidden_lib_d: hidden
30-
$(MAKE) VPATH=$(SRCDIR)/hidden -C hidden -f $(MAKEFILE_RULES) \
30+
"$(MAKE)" VPATH=$(SRCDIR)/hidden -C hidden -f $(MAKEFILE_RULES) \
3131
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=loadunload_d

‎lldb/test/API/functionalities/load_using_paths/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ all: hidden_lib a.out
66
include Makefile.rules
77

88
hidden_lib:
9-
$(MAKE) VPATH=$(SRCDIR)/hidden -C hidden -f $(MAKEFILE_RULES) \
9+
"$(MAKE)" VPATH=$(SRCDIR)/hidden -C hidden -f $(MAKEFILE_RULES) \
1010
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=loadunload
1111

‎lldb/test/API/functionalities/scripted_process/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CXXFLAGS_EXTRAS := -target $(TRIPLE)
99
all: libbaz.dylib a.out
1010

1111
libbaz.dylib: baz.cpp
12-
$(MAKE) -f $(MAKEFILE_RULES) \
12+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1313
DYLIB_ONLY=YES DYLIB_NAME=baz DYLIB_CXX_SOURCES=baz.cpp
1414

1515
include Makefile.rules

‎lldb/test/API/functionalities/stop-on-sharedlibrary-load/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ a.out: lib_a lib_b
66
include Makefile.rules
77

88
lib_a:
9-
$(MAKE) -f $(MAKEFILE_RULES) \
9+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1010
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=a.cpp DYLIB_NAME=load_a
1111

1212
lib_b:
13-
$(MAKE) -f $(MAKEFILE_RULES) \
13+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1414
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=b.cpp DYLIB_NAME=load_b
1515

1616

‎lldb/test/API/functionalities/tail_call_frames/cross_dso/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ a.out: lib_One lib_Two
1010
lib_One: lib_Two
1111

1212
lib_%:
13-
$(MAKE) VPATH=$(SRCDIR)/$* -I $(SRCDIR) -f $(SRCDIR)/$*.mk DSYMUTIL=$(DSYMUTIL)
13+
"$(MAKE)" VPATH=$(SRCDIR)/$* -I $(SRCDIR) -f $(SRCDIR)/$*.mk DSYMUTIL=$(DSYMUTIL)

‎lldb/test/API/functionalities/target-new-solib-notifications/Makefile

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
CXX_SOURCES := main.cpp
2-
LD_EXTRAS := -L. -l_d -l_c -l_a -l_b
2+
LD_EXTRAS := -L. -l_d -l_c -l_a -l_b
33

44
a.out: lib_b lib_a lib_c lib_d
55

66
include Makefile.rules
77

88
lib_a: lib_b
9-
$(MAKE) -f $(MAKEFILE_RULES) \
10-
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=a.cpp DYLIB_NAME=_a \
11-
LD_EXTRAS="-L. -l_b"
9+
"$(MAKE)" -f $(MAKEFILE_RULES) \
10+
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=a.cpp DYLIB_NAME=_a \
11+
LD_EXTRAS="-L. -l_b"
1212

1313
lib_b:
14-
$(MAKE) -f $(MAKEFILE_RULES) \
15-
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=b.cpp DYLIB_NAME=_b
14+
"$(MAKE)" -f $(MAKEFILE_RULES) \
15+
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=b.cpp DYLIB_NAME=_b
1616

1717
lib_c:
18-
$(MAKE) -f $(MAKEFILE_RULES) \
19-
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=c.cpp DYLIB_NAME=_c
18+
"$(MAKE)" -f $(MAKEFILE_RULES) \
19+
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=c.cpp DYLIB_NAME=_c
2020

2121
lib_d:
22-
$(MAKE) -f $(MAKEFILE_RULES) \
23-
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=_d
22+
"$(MAKE)" -f $(MAKEFILE_RULES) \
23+
DYLIB_ONLY=YES DYLIB_CXX_SOURCES=d.cpp DYLIB_NAME=_d

‎lldb/test/API/lang/c/conflicting-symbol/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ include Makefile.rules
77
a.out: lib_One lib_Two
88

99
lib_%:
10-
$(MAKE) VPATH=$(SRCDIR)/$* -I $(SRCDIR) -f $(SRCDIR)/$*.mk
10+
"$(MAKE)" VPATH=$(SRCDIR)/$* -I $(SRCDIR) -f $(SRCDIR)/$*.mk

‎lldb/test/API/lang/cpp/class-template-non-type-parameter-pack/TestClassTemplateNonTypeParameterPack.py

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66

77
class TestCaseClassTemplateNonTypeParameterPack(TestBase):
8-
@expectedFailureAll(
9-
oslist=["windows"], archs=["i[3-6]86", "x86_64"]
10-
) # Fails to read memory from target.
118
@no_debug_info_test
129
def test(self):
1310
self.build()

‎lldb/test/API/lang/cpp/class-template-type-parameter-pack/TestClassTemplateTypeParameterPack.py

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66

77
class TestCaseClassTemplateTypeParameterPack(TestBase):
8-
@expectedFailureAll(
9-
oslist=["windows"], archs=["i[3-6]86", "x86_64"]
10-
) # Fails to read memory from target.
118
@no_debug_info_test
129
def test(self):
1310
self.build()

‎lldb/test/API/lang/cpp/incomplete-types/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ main.o: CFLAGS_EXTRAS = -flimit-debug-info
1616

1717
limit: a.o main.o
1818
mkdir -p build_limit
19-
$(MAKE) -C $(BUILDDIR)/build_limit -f $(MAKEFILE_RULES) \
19+
"$(MAKE)" -C $(BUILDDIR)/build_limit -f $(MAKEFILE_RULES) \
2020
EXE=../limit CXX_SOURCES="length.cpp ../a.o ../main.o" \
2121
CFLAGS_EXTRAS=-flimit-debug-info NO_LIMIT_DEBUG_INFO_FLAGS=""
2222

‎lldb/test/API/lang/cpp/namespace_definitions/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ a.out: liba libb
66
include Makefile.rules
77

88
liba:
9-
$(MAKE) -f $(MAKEFILE_RULES) \
9+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1010
DYLIB_ONLY=YES DYLIB_NAME=a DYLIB_CXX_SOURCES=a.cpp
1111

1212
libb:
13-
$(MAKE) -f $(MAKEFILE_RULES) \
13+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1414
DYLIB_ONLY=YES DYLIB_NAME=b DYLIB_CXX_SOURCES=b.cpp
1515

‎lldb/test/API/lang/objc/conflicting-definition/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ include Makefile.rules
99

1010
libTest.dylib: Test/Test.m
1111
mkdir -p Test
12-
$(MAKE) MAKE_DSYM=YES -f $(MAKEFILE_RULES) \
12+
"$(MAKE)" MAKE_DSYM=YES -f $(MAKEFILE_RULES) \
1313
DYLIB_ONLY=YES DYLIB_NAME=Test DYLIB_OBJC_SOURCES=Test/Test.m \
1414
LD_EXTRAS="-lobjc -framework Foundation" \
1515
CFLAGS_EXTRAS=-I$(SRCDIR)
1616

1717
libTestExt.dylib: TestExt/TestExt.m
1818
mkdir -p TestExt
19-
$(MAKE) MAKE_DSYM=YES -f $(MAKEFILE_RULES) \
19+
"$(MAKE)" MAKE_DSYM=YES -f $(MAKEFILE_RULES) \
2020
DYLIB_ONLY=YES DYLIB_NAME=TestExt DYLIB_OBJC_SOURCES=TestExt/TestExt.m \
2121
LD_EXTRAS="-lobjc -framework Foundation -lTest -L." \
2222
CFLAGS_EXTRAS=-I$(SRCDIR)

‎lldb/test/API/lang/objc/modules-hash-mismatch/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ USE_PRIVATE_MODULE_CACHE = YES
55
.PHONY: update-module
66

77
all: $(EXE)
8-
$(MAKE) -f $(SRCDIR)/Makefile update-module
8+
"$(MAKE)" -f $(SRCDIR)/Makefile update-module
99

1010
include Makefile.rules
1111

‎lldb/test/API/lang/swift/clashing_abi_name/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ all: libLibrary.dylib a.out
77
include Makefile.rules
88

99
libLibrary.dylib: Library.swift
10-
$(MAKE) MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
10+
"$(MAKE)" MAKE_DSYM=YES CC=$(CC) SWIFTC=$(SWIFTC) \
1111
ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
1212
BASENAME=Library \
1313
SWIFTFLAGS_EXTRAS="-I$(BUILDDIR) -enable-library-evolution -emit-library -emit-module -parse-as-library -module-abi-name a" \
1414
VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
1515

1616
clean::
17-
$(MAKE) BASENAME=Library VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean
17+
"$(MAKE)" BASENAME=Library VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk clean

‎lldb/test/API/lang/swift/expression/error_missing_type/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ LD_EXTRAS = -lLibrary -L$(BUILDDIR)
44
all: libLibrary.dylib a.out
55

66
lib%.dylib: %.swift
7-
$(MAKE) MAKE_DSYM=NO DYLIB_ONLY=YES \
7+
"$(MAKE)" MAKE_DSYM=NO DYLIB_ONLY=YES \
88
DYLIB_HIDE_SWIFTMODULE=YES \
99
DYLIB_NAME=$(shell basename $< .swift) \
1010
DYLIB_SWIFT_SOURCES=$(shell basename $<) \

‎lldb/test/API/lang/swift/import_spi/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ all: A.swiftmodule $(EXE)
88
include Makefile.rules
99

1010
A.swiftmodule: $(SRCDIR)/A.swift B.swiftmodule
11-
$(MAKE) -f $(MAKEFILE_RULES) \
11+
"$(MAKE)" -f $(MAKEFILE_RULES) \
1212
DYLIB_ONLY=YES \
1313
DYLIB_NAME=A \
1414
DYLIB_SWIFT_SOURCES=A.swift \
@@ -17,7 +17,7 @@ A.swiftmodule: $(SRCDIR)/A.swift B.swiftmodule
1717
LD_EXTRAS="-L$(BUILDDIR) -lB"
1818

1919
B.swiftmodule: $(SRCDIR)/B.swift
20-
$(MAKE) -f $(MAKEFILE_RULES) \
20+
"$(MAKE)" -f $(MAKEFILE_RULES) \
2121
DYLIB_ONLY=YES \
2222
DYLIB_NAME=B \
2323
DYLIB_SWIFT_SOURCES=B.swift \

0 commit comments

Comments
 (0)