Skip to content

Commit 3c6e724

Browse files
Merge pull request #1448 from adrian-prantl/64913338
Remove custom Make rule. (NFC)
2 parents 6779a95 + 0a989e7 commit 3c6e724

File tree

2 files changed

+9
-5
lines changed
  • lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs

2 files changed

+9
-5
lines changed

lldb/test/API/lang/swift/clangimporter/objcmain_conflicting_dylibs/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ ifneq "$(CODESIGN)" ""
1212
endif
1313

1414
lib%.dylib: %.swift
15-
$(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 \
16-
-toolchain-stdlib-rpath
17-
ifneq "$(CODESIGN)" ""
18-
$(CODESIGN) -s - "$@"
19-
endif
15+
$(MAKE) MAKE_DSYM=YES \
16+
DYLIB_NAME=$(shell basename $< .swift) \
17+
VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
2018

2119
clean::
2220
rm -rf *.swiftmodule *.swiftdoc *.dSYM *~ lib*.dylib a.out *.o
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
DYLIB_ONLY := YES
2+
DYLIB_SWIFT_SOURCES := $(DYLIB_NAME).swift
3+
SWIFT_OBJC_HEADER = $(DYLIB_NAME).h
4+
SWIFTFLAGS_EXTRAS = -Xcc -I$(SRCDIR) -I$(SRCDIR)/$(DYLIB_NAME)
5+
6+
include Makefile.rules

0 commit comments

Comments
 (0)