From 0a989e750ac9cc229aec1dcbcad84b48500c0573 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Mon, 13 Jul 2020 16:41:21 -0700 Subject: [PATCH] Remove custom Make rule. (NFC) (cherry picked from commit 64c3adf710ad26d64cc17e64900f65a5be8bf283) --- .../clangimporter/objcmain_conflicting_dylibs/Makefile | 8 +++----- .../clangimporter/objcmain_conflicting_dylibs/dylib.mk | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/dylib.mk diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile index 156b5d0d9d65e..f48d865b33d94 100644 --- a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile +++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile @@ -12,11 +12,9 @@ ifneq "$(CODESIGN)" "" endif lib%.dylib: %.swift - $(SWIFTC) -g -Onone $^ -emit-library -module-name $(shell basename $< .swift) -emit-module -Xlinker -install_name -Xlinker @executable_path/$@ -Xcc -I$(SRCDIR) -Xcc -I$(SRCDIR)/$(shell basename $< .swift) $(SWIFTFLAGS) -emit-objc-header-path $(shell basename $< .swift).h \ - -toolchain-stdlib-rpath -ifneq "$(CODESIGN)" "" - $(CODESIGN) -s - "$@" -endif + $(MAKE) MAKE_DSYM=YES \ + DYLIB_NAME=$(shell basename $< .swift) \ + VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all clean:: rm -rf *.swiftmodule *.swiftdoc *.dSYM *~ lib*.dylib a.out *.o diff --git a/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/dylib.mk b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/dylib.mk new file mode 100644 index 0000000000000..3df5de7cf022f --- /dev/null +++ b/lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/dylib.mk @@ -0,0 +1,6 @@ +DYLIB_ONLY := YES +DYLIB_SWIFT_SOURCES := $(DYLIB_NAME).swift +SWIFT_OBJC_HEADER = $(DYLIB_NAME).h +SWIFTFLAGS_EXTRAS = -Xcc -I$(SRCDIR) -I$(SRCDIR)/$(DYLIB_NAME) + +include Makefile.rules