Merge pull request #84 from DougGregor/update-tsc

Update to a newer version of swift-tools-support-core

Author: DougGregor

Package.resolved

@@ -423,6 +423,7 @@ class ExecuteJobRule: LLBuildRule {
       context.delegateQueue.async {
         let result = ProcessResult(
           arguments: [],
+          environment: env,
           exitStatus: .terminated(code: 1),
           output: Result.success([]),
           stderrOutput: Result.success([])

Sources/SwiftDriver/Execution/JobExecutor.swift

@@ -146,7 +146,7 @@ public struct IncrementalCompilation {
       .map {$0.option.spelling}
       .sorted()
       .joined()
-    return SHA256(hashInput).digestString()
+    return SHA256().hash(hashInput).hexadecimalRepresentation
   }
 }
 

Sources/SwiftDriver/Incremental Compilation/IncrementalCompilation.swift

@@ -28,6 +28,7 @@ class JobCollectingDelegate: JobExecutorDelegate {
     func waitUntilExit() throws -> ProcessResult {
       return ProcessResult(
         arguments: [],
+        environment: [:],
         exitStatus: .terminated(code: 0),
         output: Result.success(ByteString("test").contents),
         stderrOutput: Result.success([])

Tests/SwiftDriverTests/JobExecutorTests.swift

@@ -830,6 +830,9 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertFalse(cmd.contains(.flag("-shared")))
     }
 
+    // FIXME: This test will fail when run on macOS, because
+    // swift-autolink-extract is not present
+    #if os(Linux)
     do {
       // linux target
       var driver = try Driver(args: commonArgs + ["-emit-library", "-target", "x86_64-unknown-linux"])
@@ -857,7 +860,11 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertFalse(cmd.contains(.flag("-dylib")))
       XCTAssertFalse(cmd.contains(.flag("-static")))
     }
+    #endif
 
+    // FIXME: This test will fail when run on macOS, because
+    // swift-autolink-extract is not present
+    #if os(Linux)
     do {
       // static linux linking
       var driver = try Driver(args: commonArgs + ["-emit-library", "-static", "-target", "x86_64-unknown-linux"])
@@ -886,6 +893,7 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertFalse(cmd.contains(.flag("-static")))
       XCTAssertFalse(cmd.contains(.flag("-shared")))
     }
+    #endif
   }
 
   func testSanitizerArgs() throws {