Fix product path for cmodules, remove -working-dir flag

Author: aciidgh

Sources/Build/describe().swift

@@ -112,21 +112,21 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
         //FIXME: Generate modulemaps if possible
         //Since we're not generating modulemaps currently we'll just emit empty module map file
         //if it not present
-        if !module.path.isFile {
-            try mkdir(module.path.parentDirectory)
-            try fopen(module.path, mode: .Write) { fp in
+        if !module.moduleMapPath.isFile {
+            try mkdir(module.moduleMapPath.parentDirectory)
+            try fopen(module.moduleMapPath, mode: .Write) { fp in
                 try fputs("\n", fp)
             }
         }
 
         let inputs = module.dependencies.map{ $0.targetName } + module.sources.paths
-        let productPath = Path.join(prefix, "\(module.c99name).o")
+        let productPath = Path.join(prefix, "lib\(module.c99name).so")
         let wd = Path.join(prefix, "\(module.c99name).build")
         mkdirs.insert(wd)
 
         var args: [String] = []
         args += ["-fmodules", "-fmodule-name=\(module.name)"]
-        args += ["-fmodule-map-file=\(module.path)", "-working-directory", Path.join(prefix, "\(module.c99name).build")]
+        args += ["-fmodule-map-file=\(module.moduleMapPath)"]
 
         switch conf {
         case .Debug:
@@ -136,7 +136,7 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
         }
 
         args += module.sources.paths
-        args += ["-shared", "-o", Path.join(prefix, "lib\(module.c99name).so")]
+        args += ["-shared", "-o", productPath]
 
         let clang = ShellTool(
             description: "Compiling \(module.name)",

Sources/Build/misc.swift

@@ -26,14 +26,17 @@ func platformArgs() -> [String] {
     return args
 }
 
+extension CModule {
+    var moduleMapPath: String {
+        return Path.join(path, "module.modulemap")
+    }
+}
+
 extension Module {
     var Xcc: [String] {
         return recursiveDependencies.flatMap { module -> [String] in
             if let module = module as? CModule {
-                let moduleMapPath = Path.join(module.path, "module.modulemap")
-                return ["-Xcc", "-fmodule-map-file=\(moduleMapPath)"]
-            } else if let cmodule = module as? ClangModule {
-                return ["-Xcc", "-fmodule-map-file=\(cmodule.path)"]
+                return ["-Xcc", "-fmodule-map-file=\(module.moduleMapPath)"]
             } else {
                 return []
             }

Sources/PackageType/Module.swift

@@ -75,8 +75,8 @@ public class ClangModule: CModule {
 
     public init(name: String, sources: Sources) {
         self.sources = sources
-        //TODO: generate this with swiftpm if layout supports
-        super.init(name: name, path: sources.root + "/include/module.modulemap")
+        //TODO: generate module map using swiftpm if layout can support
+        super.init(name: name, path: sources.root + "/include")
     }
 }
 

Sources/Transmute/fillModuleGraph().swift

@@ -20,8 +20,6 @@ func fillModuleGraph(packages: [Package], modulesForPackage: (Package) -> [Modul
                     return false
                 case let module as SwiftModule where module.type == .Library:
                     return true
-                case is ClangModule:
-                    return true
                 case is CModule:
                     return true
                 default: