@@ -708,17 +708,14 @@ MODULENAME?=$(DYLIB_NAME)
708
708
PARSE_AS_LIBRARY = -parse-as-library
709
709
endif
710
710
711
- ifneq "$(SWIFT_OBJC_HEADER)" ""
712
- SWIFT_OBJC_HEADER_FLAGS=-emit-objc-header-path $(SWIFT_OBJC_HEADER)
713
- endif
714
-
715
711
VPATHSOURCES=$(patsubst %,$(VPATH)/%,$(SWIFT_SOURCES))
716
- %.o: %.swift $(SWIFT_BRIDGING_PCH)
712
+ VPATHDYLIBSOURCES=$(patsubst %,$(VPATH)/%,$(DYLIB_SWIFT_SOURCES))
713
+
714
+ %.o: %.swift $(SWIFT_BRIDGING_PCH) $(SWIFT_OBJC_HEADER)
717
715
@echo "### Compiling" $<
718
716
$(SWIFT_FE) -c -primary-file $< \
719
717
$(filter-out $(VPATH)/$<,$(filter-out $<,$(VPATHSOURCES))) \
720
718
$(SWIFT_FEFLAGS) $(SWIFT_HFLAGS) $(PARSE_AS_LIBRARY) \
721
- $(SWIFT_OBJC_HEADER_FLAGS) \
722
719
-module-name $(MODULENAME) -emit-module-path \
723
720
$(patsubst %.o,$(BUILDDIR)/%.partial.swiftmodule,$@) \
724
721
-o $(BUILDDIR)/$@
@@ -763,6 +760,15 @@ $(SWIFT_BRIDGING_PCH): $(SWIFT_BRIDGING_HEADER)
763
760
$(SWIFT_FE) -emit-pch $(SWIFT_FEFLAGS) $< -o $(BUILDDIR)/$@
764
761
endif
765
762
763
+ # Swift Obj-C header.
764
+ ifneq "$(SWIFT_OBJC_HEADER)" ""
765
+ $(SWIFT_OBJC_HEADER): $(SWIFT_SOURCES) $(DYLIB_SWIFT_SOURCES)
766
+ @echo "### Building Obj-C header"
767
+ $(SWIFT_FE) -typecheck $(VPATHSOURCES) $(VPATHDYLIBSOURCES) \
768
+ $(SWIFT_FEFLAGS) $(SWIFT_HFLAGS) -module-name $(MODULENAME) \
769
+ -emit-objc-header-path $(SWIFT_OBJC_HEADER)
770
+ endif
771
+
766
772
else # USESWIFTDRIVER = 0
767
773
#----------------------------------------------------------------------
768
774
0 commit comments