HACK to allow us to pass a -I for CI XCTest use

Will remove shortly with a proper flag.

Author: mxcl

Sources/Build/describe().swift

@@ -22,7 +22,7 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
         fatalError("No modules input")  //TODO throw
     }
 
-    let Xcc = Xcc.flatMap{ ["-Xcc", $0] }
+    let Xcc = Xcc.flatMap{ ["-Xcc", $0] } + extraImports()
     let Xld = Xld.flatMap{ ["-Xlinker", $0] }
     let prefix = try mkdir(prefix, conf.dirname)
     let yaml = try YAML(path: "\(prefix).yaml")
@@ -147,6 +147,7 @@ public func describe(prefix: String, _ conf: Configuration, _ modules: [Module],
                 let hack2 = hack1.sources.root.parentDirectory
                 let hack3 = Path.join(hack2, "LinuxMain.swift")
                 args.append(hack3)
+                args += Xcc
 
                 args.append("-emit-executable")
                 args += ["-I", prefix]
@@ -181,3 +182,12 @@ extension Product {
         return recursiveDependencies(modules.map{$0}).flatMap{ $0 as? SwiftModule }
     }
 }
+
+private func extraImports() -> [String] {
+    //FIXME HACK
+    if let I = getenv("SWIFTPM_EXTRA_IMPORT") {
+        return ["-I", I]
+    } else {
+        return []
+    }
+}

Utilities/bootstrap

@@ -532,7 +532,7 @@ a location ('--prefix').""")
 
     cmd = [os.path.join(sandbox_path, "bin", "swift-build")]
     if opts.xctest_path:
-        cmd.extend(["-Xcc", "-I", "-Xcc", opts.xctest_path])
+        env_cmd.append("SWIFTPM_EXTRA_IMPORT=" + opts.xctest_path)
         # Tell the linker where to look for XCTest, but autolinking
         # knows to pass -lXCTest.
         cmd.extend(["-Xlinker", "-L", "-Xlinker", opts.xctest_path])