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