Validate that -static-executable is not supported on Darwin.

artemcm · artemcm · commit 3fcaa347b94a · 2021-05-07T09:20:12.000-07:00
Resolves rdar://77631444
diff --git a/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift b/Sources/SwiftDriver/Toolchains/DarwinToolchain.swift
@@ -181,7 +181,11 @@ import SwiftOptions
     }
     // Validating darwin unsupported -static-stdlib argument.
     if parsedOptions.hasArgument(.staticStdlib) {
-        throw ToolchainValidationError.argumentNotSupported("-static-stdlib")
+      throw ToolchainValidationError.argumentNotSupported("-static-stdlib")
+    }
+    // Validating darwin unsupported -static-executable argument.
+    if parsedOptions.hasArgument(.staticExecutable) {
+      throw ToolchainValidationError.argumentNotSupported("-static-executable")
     }
     // If a C++ standard library is specified, it has to be libc++.
     if let cxxLib = parsedOptions.getLastArgument(.experimentalCxxStdlib) {
diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift
@@ -2385,6 +2385,14 @@ final class SwiftDriverTests: XCTestCase {
         return
       }
     }
+
+    XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-static-executable", "-target", "x86_64-apple-macosx10.14",
+                                           "foo.swift"])) { error in
+      guard case DarwinToolchain.ToolchainValidationError.argumentNotSupported("-static-executable") = error else {
+        XCTFail()
+        return
+      }
+    }
     
     XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-target", "x86_64-apple-macosx10.14", "-experimental-cxx-stdlib", "libstdc++",
                                            "foo.swift"])) { error in

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,11 @@ import SwiftOptions`
`181`	`181`	`}`
`182`	`182`	`// Validating darwin unsupported -static-stdlib argument.`
`183`	`183`	`if parsedOptions.hasArgument(.staticStdlib) {`
`184`		`- throw ToolchainValidationError.argumentNotSupported("-static-stdlib")`
	`184`	`+ throw ToolchainValidationError.argumentNotSupported("-static-stdlib")`
	`185`	`+ }`
	`186`	`+ // Validating darwin unsupported -static-executable argument.`
	`187`	`+ if parsedOptions.hasArgument(.staticExecutable) {`
	`188`	`+ throw ToolchainValidationError.argumentNotSupported("-static-executable")`
`185`	`189`	`}`
`186`	`190`	`// If a C++ standard library is specified, it has to be libc++.`
`187`	`191`	`if let cxxLib = parsedOptions.getLastArgument(.experimentalCxxStdlib) {`
Original file line number	Diff line number	Diff line change
`@@ -2385,6 +2385,14 @@ final class SwiftDriverTests: XCTestCase {`
`2385`	`2385`	`return`
`2386`	`2386`	`}`
`2387`	`2387`	`}`
	`2388`	`+`
	`2389`	`+ XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-static-executable", "-target", "x86_64-apple-macosx10.14",`
	`2390`	`+ "foo.swift"])) { error in`
	`2391`	`+ guard case DarwinToolchain.ToolchainValidationError.argumentNotSupported("-static-executable") = error else {`
	`2392`	`+ XCTFail()`
	`2393`	`+ return`
	`2394`	`+ }`
	`2395`	`+ }`
`2388`	`2396`
`2389`	`2397`	`XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-target", "x86_64-apple-macosx10.14", "-experimental-cxx-stdlib", "libstdc++",`
`2390`	`2398`	`"foo.swift"])) { error in`