Revert modulemaps changes from PR #94

The Linux and Darwin module maps need to be kept separate as they have
different linkage requirements.

<rdar://problem/27366695>

Signed-off-by: Daniel A. Steffen <dsteffen@apple.com>

Author: das

dispatch/Makefile.am

@@ -24,5 +24,5 @@ dispatch_HEADERS=	\
 	time.h
 
 if HAVE_SWIFT
-dispatch_HEADERS+=module.modulemap
+dispatch_HEADERS+=module.map
 endif

dispatch/module.map

@@ -0,0 +1,20 @@
+module Dispatch {
+	requires blocks
+	export *
+	link "dispatch"
+	link "BlocksRuntime"
+}
+
+module DispatchIntrospection [system] [extern_c] {
+	header "introspection.h"
+	export *
+}
+
+module CDispatch [system] [extern_c] {
+	umbrella header "dispatch.h"
+	module * { export * }
+	export *
+	requires blocks
+	link "dispatch"
+	link "BlocksRuntime"
+}

dispatch/module.modulemap

@@ -1,20 +1,10 @@
-module Dispatch {
-	requires blocks
+module Dispatch [system] [extern_c] {
+	umbrella header "dispatch.h"
+	module * { export * }
 	export *
-	link "dispatch"
-	link "BlocksRuntime"
 }
 
 module DispatchIntrospection [system] [extern_c] {
 	header "introspection.h"
 	export *
 }
-
-module CDispatch [system] [extern_c] {
-	umbrella header "dispatch.h"
-	module * { export * }
-	export *
-	requires blocks
-	link "dispatch"
-	link "BlocksRuntime"
-}

src/Makefile.am

@@ -149,7 +149,7 @@ SWIFT_GEN_FILES=	\
 	$(SWIFT_OBJ_FILES:%=%.~partial.swiftdoc) \
 	$(SWIFT_OBJ_FILES:%=%.~partial.swiftdeps)
 
-SWIFTC_FLAGS = -Xcc -fmodule-map-file=$(abs_top_srcdir)/dispatch/module.modulemap -I$(abs_top_srcdir) -Xcc -fblocks
+SWIFTC_FLAGS = -Xcc -fmodule-map-file=$(abs_top_srcdir)/dispatch/module.map -I$(abs_top_srcdir) -Xcc -fblocks
 
 $(abs_builddir)/swift/%.o:	$(abs_srcdir)/swift/%.swift
 	$(SWIFTC) -frontend -c $(SWIFT_ABS_SRC_FILES) -primary-file $< \