Skip to content

Commit 61b3a90

Browse files
Merge pull request #11135 from adrian-prantl/cherry-pick-next-lldb-Fix-test-linker-flags-for-binutils-ld
[Cherry-pick into next] [lldb] Fix test linker flags for binutils ld
2 parents 8de7af3 + fc9f639 commit 61b3a90

File tree

3 files changed

+3
-3
lines changed
  • lldb/test/API/lang/swift

3 files changed

+3
-3
lines changed

lldb/test/API/lang/swift/expression/import_search_paths/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ libDirect: $(SRCDIR)/Direct.swift libHidden
2525
DYLIB_SWIFT_SOURCES=Direct.swift \
2626
DYLIB_MODULENAME=Direct \
2727
SWIFTFLAGS_EXTRAS="-I$(BUILDDIR)/hidden" \
28-
LD_EXTRAS="-L$(BUILDDIR)/hidden -lIndirect" \
28+
LD_EXTRAS="-L$(BUILDDIR)/hidden -lIndirect -Xlinker -rpath -Xlinker $(BUILDDIR)/hidden" \
2929
MAKE_DSYM=NO
3030

lldb/test/API/lang/swift/implementation_only_imports/library_indirect/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SomeLibraryCore.swiftmodule: SomeLibraryCore.swift
1212

1313
SomeLibrary.swiftmodule: SomeLibrary.swift SomeLibraryCore.swiftmodule
1414
"$(MAKE)" BASENAME=$(shell basename $@ .swiftmodule) \
15-
VPATH=$(SRCDIR) -f $(SRCDIR)/../dylib.mk all
15+
VPATH=$(SRCDIR) LD_EXTRAS="-L$(BUILDDIR) -Xlinker -rpath -Xlinker $(BUILDDIR)" -f $(SRCDIR)/../dylib.mk all
1616

1717
clean::
1818
rm -rf *.o *.dylib *.so *.dll *.dSYM *.swiftdoc *.swiftmodule *.swiftinterface

lldb/test/API/lang/swift/implementation_only_imports/library_resilient/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SomeLibraryCore.swiftmodule: SomeLibraryCore.swift
1414
SomeLibrary.swiftmodule: SomeLibrary.swift SomeLibraryCore.swiftmodule
1515
"$(MAKE)" BASENAME=$(shell basename $@ .swiftmodule) \
1616
SWIFTFLAGS_EXTRAS=-enable-library-evolution \
17-
VPATH=$(SRCDIR) -f $(SRCDIR)/../dylib.mk all
17+
VPATH=$(SRCDIR) LD_EXTRAS="-L$(BUILDDIR) -Xlinker -rpath -Xlinker $(BUILDDIR)" -f $(SRCDIR)/../dylib.mk all
1818

1919
clean::
2020
rm -rf *.o *.dylib *.so *.dll *.dSYM *.swiftdoc *.swiftmodule *.swiftinterface

0 commit comments

Comments
 (0)