Add C++ support in ClangModule

apple · May 21, 2016 · f048d3b · f048d3b
1 parent f9d8cfc
commit f048d3b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 25 deletions.
diff --git a/Sources/Build/Command.compile(ClangModule).swift b/Sources/Build/Command.compile(ClangModule).swift
@@ -86,7 +86,10 @@ extension Command {
             var args = basicArgs
             args += ["-MD", "-MT", "dependencies", "-MF", path.deps]
             args += ["-c", path.source, "-o", path.object]
-
+            // Append -std flag if file is cpp.
+            if path.source.isCpp {
+               args += ["-std=c++14"]
+            }
             let clang = ClangTool(desc: "Compile \(module.name) \(path.filename)",
                                   inputs: dependencies + [path.source],
                                   outputs: [path.object],
@@ -105,6 +108,7 @@ extension Command {
         var args = module.basicArgs
         args += module.optimizationFlags(conf)
         args += ["-L\(prefix)"]
+        args += module.languageArgs
         args += module.linkFlags
         args += module.sources.compilePathsForBuildDir(wd).map{$0.object}
         args += Xld

diff --git a/Sources/Build/misc.swift b/Sources/Build/misc.swift
@@ -43,6 +43,42 @@ extension CModule {
     }
 }
 
+extension String {
+    var isCpp: Bool {
+        guard let ext = self.fileExt else {
+            return false
+        }
+        return ext == "cpp"
+    }
+}
+
+extension ClangModule {
+    // Returns language specific arguments for a ClangModule.
+    var languageArgs: [String] {
+        var args = [String]() 
+        // Check if this module contains any cpp file.
+        var linkCpp = self.containsCppFiles
+        // Otherwise check if any of its dependencies contains a cpp file.
+        if !linkCpp {
+            for case let dep as ClangModule in recursiveDependencies {
+                if dep.containsCppFiles {
+                    linkCpp = true
+                    break
+                }
+            }
+        }
+        // Link C++ if found any cpp source. 
+        if linkCpp {
+            args += ["-lc++"]
+        }
+        return args
+    }
+
+    var containsCppFiles: Bool {
+        return sources.paths.contains { $0.isCpp } 
+    }
+}
+
 extension ClangModule {
 
     public enum ModuleMapError: ErrorProtocol {

diff --git a/Sources/PackageModel/Sources.swift b/Sources/PackageModel/Sources.swift
@@ -29,7 +29,7 @@ public struct Sources {
 
     static public var validSwiftExtensions = Set<String>(["swift"])
 
-    static public var validCExtensions = Set<String>(["c"])
+    static public var validCExtensions = Set<String>(["c", "m", "cc", "cpp", "cxx"])
 
     static public var validExtensions = { validSwiftExtensions.union(validCExtensions) }()
 }
diff --git a/Tests/Functional/ClangModuleTests.swift b/Tests/Functional/ClangModuleTests.swift
@@ -100,29 +100,6 @@ class ClangModulesTestCase: XCTestCase {
             XCTAssertFileExists(prefix, ".build", "debug", "libCDynamicLookup.so")
         }
     }
-
-    #if os(OSX)
-    func testObjectiveCModule() {
-        fixture(name: "ClangModules/Objc") { prefix in
-            XCTAssertBuilds(prefix)
-
-            // Check if objc module is present.
-            XCTAssertFileExists(prefix, ".build", "debug", "libobjc.so")
-
-            // Test objc executable (depends on objc module).
-            let objcExec = ".build/debug/objc_exec"
-            XCTAssertFileExists(prefix, objcExec)
-            var output = try popen([Path.join(prefix, objcExec)])
-            XCTAssertEqual(output, "Hello from Objc 5")
-
-            // Test swift executable (depends on objc module).
-            let swiftExec = ".build/debug/swift-exec"
-            XCTAssertFileExists(prefix, swiftExec)
-            output = try popen([Path.join(prefix, swiftExec)])
-            XCTAssertEqual(output, "5\n")
-        }
-    }
-    #endif
 }