Add iquote to have dependencies between c modules

Author: aciidgh

Fixtures/ClangModules/CLibraryiquote/Package.swift

@@ -0,0 +1,8 @@
+import PackageDescription
+
+let package = Package(
+    name: "CLibraryiquote",
+    targets: [
+		Target(name: "Bar", dependencies: ["Foo"]),
+		Target(name: "Baz", dependencies: ["Foo", "Bar"])]
+)

Fixtures/ClangModules/CLibraryiquote/Sources/Bar/Bar.c

@@ -0,0 +1,9 @@
+#include "include/Bar/Bar.h"
+#include "Foo/Foo.h"
+
+int bar() {
+    int a = foo();
+    int b = a;
+    a = b;
+    return a;
+}

Fixtures/ClangModules/CLibraryiquote/Sources/Bar/include/Bar/Bar.h

@@ -0,0 +1 @@
+int bar();

Fixtures/ClangModules/CLibraryiquote/Sources/Bar/include/module.modulemap

@@ -0,0 +1,5 @@
+module Bar {
+  header "Bar/Bar.h"
+  link "Bar"
+  export *
+}

Fixtures/ClangModules/CLibraryiquote/Sources/Baz/main.swift

@@ -0,0 +1,5 @@
+import Foo
+import Bar
+
+let _ = foo()
+let _ = bar()

Fixtures/ClangModules/CLibraryiquote/Sources/Foo/Foo.c

@@ -0,0 +1,8 @@
+#include "include/Foo/Foo.h"
+
+int foo() {
+    int a = 5;
+    int b = a;
+    a = b;
+    return a;
+}

Fixtures/ClangModules/CLibraryiquote/Sources/Foo/include/Foo/Foo.h

@@ -0,0 +1 @@
+int foo();

Fixtures/ClangModules/CLibraryiquote/Sources/Foo/include/module.modulemap

@@ -0,0 +1,5 @@
+module Foo {
+  header "Foo/Foo.h"
+  link "Foo"
+  export *
+}

Sources/Build/describe().swift

@@ -126,10 +126,11 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
 
         var args: [String] = []
         args += ["-fmodules", "-fmodule-name=\(module.name)"]
-        args += ["-fmodule-map-file=\(module.moduleMapPath)"]
+        args += ["-L\(prefix)"]
 
-        for case let otherModule as ClangModule in modules where otherModule != module {
-            args += ["-iquote", otherModule.path]
+        for case let dep as ClangModule in module.dependencies {
+            args += ["-iquote", dep.path]
+            args += ["-l\(dep.c99name)"] //FIXME: giving path to other module's -fmodule-map-file is not linking that module
         }
 
         switch conf {

Tests/Functional/TestCLangModules.swift

@@ -47,6 +47,14 @@ class TestClangModulesTestCase: XCTestCase {
             XCTAssertDirectoryExists(prefix, "Bar/Packages/Foo-1.2.3")
         }
     }
+    
+    func testiquoteDep() {
+        fixture(name: "ClangModules/CLibraryiquote") { prefix in
+            XCTAssertBuilds(prefix)
+            XCTAssertFileExists(prefix, ".build", "debug", "libFoo.so")
+            XCTAssertFileExists(prefix, ".build", "debug", "libBar.so")
+        }
+    }
 }