Makefiles: Promote EXCLUDE_WRAPPED_SWIFTMODULE into a more general DYLIB_HIDE_SWIFTMODULE facility.

Author: adrian-prantl

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

@@ -587,8 +587,7 @@ MODULENAME?=$(DYLIB_NAME)
 PARSE_AS_LIBRARY = -parse-as-library
 endif
 
-VPATHSOURCES=$(patsubst %,$(VPATH)/%,$(SWIFT_SOURCES))
-VPATHDYLIBSOURCES=$(patsubst %,$(VPATH)/%,$(DYLIB_SWIFT_SOURCES))
+VPATHSOURCES=$(patsubst %,$(VPATH)/%,$(SWIFT_SOURCES)) $(patsubst %,$(VPATH)/%,$(DYLIB_SWIFT_SOURCES))
 
 %.o: %.swift $(SWIFT_BRIDGING_PCH) $(SWIFT_OBJC_HEADER)
 	@echo "### Compiling" $<
@@ -602,8 +601,8 @@ VPATHDYLIBSOURCES=$(patsubst %,$(VPATH)/%,$(DYLIB_SWIFT_SOURCES))
 ifeq "$(OS)" "Darwin"
 $(EXE): $(MODULENAME).swiftmodule $(OBJECTS)
 	@echo "### Linking" $(EXE)
-	$(SWIFTC) $(LD_EXTRAS) \
-	  $(patsubst $<,-Xlinker -add_ast_path -Xlinker $(BUILDDIR)/$<,$^) \
+	$(SWIFTC) $(LD_EXTRAS) $(OBJECTS) \
+	  -Xlinker -add_ast_path -Xlinker $(MODULENAME).swiftmodule \
 	  $(patsubst -g,,$(SWIFTFLAGS)) -o "$(EXE)"
 ifneq "$(CODESIGN)" ""
 	$(CODESIGN) -s - "$(EXE)"
@@ -625,8 +624,9 @@ endif
 $(MODULENAME).swiftmodule: $(OBJECTS) $(DYLIB_OBJECTS)
 	@echo "### Merging swift modules for $(MODULENAME)"
 	$(SWIFT_FE) $(SWIFT_FEFLAGS) $(SWIFT_HFLAGS) -merge-modules \
-	  -emit-module $(patsubst %.swift,%.partial.swiftmodule,$(SWIFT_SOURCES) $(DYLIB_SWIFT_SOURCES)) \
+	  -emit-module \
 	  -emit-module-interface-path $(BUILDDIR)/$(MODULENAME).swiftinterface \
+	  $(patsubst %.swift,%.partial.swiftmodule,$(SWIFT_SOURCES) $(DYLIB_SWIFT_SOURCES)) \
 	  -disable-diagnostic-passes -disable-sil-perf-optzns \
 	  -module-name $(MODULENAME) \
 	  -o $(BUILDDIR)/$@
@@ -642,7 +642,7 @@ endif
 ifneq "$(SWIFT_OBJC_HEADER)" ""
 $(SWIFT_OBJC_HEADER): $(SWIFT_SOURCES) $(DYLIB_SWIFT_SOURCES)
 	@echo "### Building Obj-C header"
-	$(SWIFT_FE) -typecheck $(VPATHSOURCES) $(VPATHDYLIBSOURCES) \
+	$(SWIFT_FE) -typecheck $(VPATHSOURCES) \
 	  $(SWIFT_FEFLAGS) $(SWIFT_HFLAGS) -module-name $(MODULENAME) \
 	  -emit-objc-header-path $(SWIFT_OBJC_HEADER)
 endif
@@ -693,21 +693,23 @@ ifeq "$(USESWIFTDRIVER)" "1"
 ifeq "$(OS)" "Darwin"
 DYLIB_SWIFT_FLAGS=  \
 	 -Xlinker -dylib \
-	 -Xlinker -add_ast_path -Xlinker $(DYLIB_NAME).swiftmodule \
 	 -Xlinker -install_name -Xlinker @executable_path/$(shell basename $@) \
 	 $(LD_EXTRAS)
+ifeq "$(DYLIB_HIDE_SWIFTMODULE)" ""
+DYLIB_SWIFT_FLAGS+= -Xlinker -add_ast_path -Xlinker $(DYLIB_NAME).swiftmodule
+endif
 else
 DYLIB_SWIFT_FLAGS=$(LD_EXTRAS)
 endif
-$(DYLIB_FILENAME) : $(DYLIB_OBJECTS)
+$(DYLIB_FILENAME) : $(DYLIB_OBJECTS) $(MODULE_INTERFACE)
 	@echo "### Linking dynamic library $(DYLIB_NAME)"
-ifneq "$(EXCLUDE_WRAPPED_SWIFTMODULE)" ""
+ifneq "$(DYLIB_HIDE_SWIFTMODULE)" ""
 	$(SWIFTC) $(patsubst -g,,$(SWIFTFLAGS)) \
             -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ \
-            $(patsubst %.swiftmodule.o,,$^)
+            $(patsubst %.swiftmodule.o,,$(DYLIB_OBJECTS))
 else
 	$(SWIFTC) $(patsubst -g,,$(SWIFTFLAGS)) \
-            -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ $^
+            -emit-library $(DYLIB_SWIFT_FLAGS) -o $@ $(DYLIB_OBJECTS)
 endif
 ifneq "$(CODESIGN)" ""
 	$(CODESIGN) -s - "$(DYLIB_FILENAME)"

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

@@ -10,5 +10,5 @@ include Makefile.rules
 libfooey.dylib: one.swift two.swift
 	$(MAKE) -f $(MAKEFILE_RULES) \
 		MAKE_DSYM=YES DYLIB_ONLY=YES DYLIB_NAME=fooey \
-		SWIFT_SOURCES="one.swift two.swift" \
+		DYLIB_SWIFT_SOURCES="one.swift two.swift" \
 		SWIFTFLAGS_EXTRAS=-I$(BUILDDIR)

lldb/test/API/lang/swift/implementation_only_imports/dylib.mk

@@ -4,7 +4,7 @@ DYLIB_NAME := $(BASENAME)
 DYLIB_SWIFT_SOURCES := $(DYLIB_NAME).swift
 # Disable debug info for the library.
 override MAKE_DSYM := NO
-EXCLUDE_WRAPPED_SWIFTMODULE := YES
+DYLIB_HIDE_SWIFTMODULE := YES
 SWIFTFLAGS := -gnone -I. -module-link-name $(BASENAME)
 LD_EXTRAS := -L.
 

lldb/test/API/lang/swift/parseable_interfaces/dsym/libs/Makefile

@@ -10,7 +10,7 @@ SWIFTFLAGS=-Onone -Xfrontend -serialize-debugging-options -enable-library-evolut
 # the .swiftinterface. The issue here is that if the .swiftmodule is wrapped
 # and linked into the dylib, LLDB will find it there and load it before the
 # .swiftinterface loading path can be exercised.
-EXCLUDE_WRAPPED_SWIFTMODULE=1
+DYLIB_HIDE_SWIFTMODULE=1
 endif
 
 include Makefile.rules

lldb/test/API/lang/swift/parseable_interfaces/shared/libs/Makefile

@@ -9,7 +9,7 @@ SWIFTFLAGS=-Onone -Xfrontend -serialize-debugging-options -enable-library-evolut
 # the .swiftinterface. The issue here is that if the .swiftmodule is wrapped
 # and linked into the dylib, LLDB will find it there and load it before the
 # .swiftinterface loading path can be exercised.
-EXCLUDE_WRAPPED_SWIFTMODULE=1
+DYLIB_HIDE_SWIFTMODULE=1
 
 include Makefile.rules
 

lldb/test/API/lang/swift/parseable_interfaces/static/libs/Makefile

@@ -11,7 +11,7 @@ SWIFTFLAGS_EXTRAS := -enable-library-evolution
 # the .swiftinterface. The issue here is that if the .swiftmodule is wrapped
 # and linked into the library, LLDB may find it there and load it before the
 # .swiftinterface loading path can be exercised.
-EXCLUDE_WRAPPED_SWIFTMODULE=1
+DYLIB_HIDE_SWIFTMODULE=1
 
 include Makefile.rules
 

lldb/test/API/lang/swift/playgrounds-repl/Makefile.common

@@ -6,6 +6,7 @@ PlaygroundStub: libPlaygroundsRuntime.dylib
 include Makefile.rules
 
 ifneq ($(MAKECMDGOALS),libPlaygroundsRuntime.dylib)
+LD_EXTRAS := -L. -lPlaygroundsRuntime
 libPlaygroundsRuntime.dylib: PlaygroundsRuntime.swift
 	$(MAKE) -C $(BUILDDIR) -f $(SRCDIR)/Makefile \
 		SWIFT_SOURCES= DYLIB_SWIFT_SOURCES=PlaygroundsRuntime.swift \

lldb/test/API/lang/swift/playgrounds/Makefile

@@ -4,6 +4,7 @@ SWIFT_SOURCES = PlaygroundStub.swift
 # The deployment target we set is pre-ABI stability. The Swift driver will not
 # point the RPATH at the system library. Do it manually.
 LD_EXTRAS := -Xlinker -rpath -Xlinker /usr/lib/swift
+LD_EXTRAS += -L. -lPlaygroundsRuntime
 
 PlaygroundStub: libPlaygroundsRuntime.dylib