Skip to content

[lldb] Support even more swiftlang tests with nested make invocations… #9897

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2025
+5 −5
Merged

[lldb] Support even more swiftlang tests with nested make invocations… #9897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lldb/test/API/lang/swift/clashing_abi_name/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lldb/test/API/lang/swift/expression/error_missing_type/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $<) \
Expand Down
4 changes: 2 additions & 2 deletions lldb/test/API/lang/swift/import_spi/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down