[Unix] Use the new -sysroot flag for all non-Darwin Unix platforms, not just Android (#1811)

This makes two changes:

1. Use the new flag on all Unix platforms, as in the original frontend pull where
   it was introduced, swiftlang/swift#72352.
2. When compiling for Android and `ANDROID_NDK_ROOT` is unset, fall back to the
   `-sdk` as the sysroot when linking.

Author: finagolfin

Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

@@ -217,14 +217,14 @@ extension GenericUnixToolchain {
         commandLine.appendPath(try VirtualPath(path: opt.argument.asSingle))
       }
 
-      if targetTriple.environment == .android {
-        if let sysroot = parsedOptions.getLastArgument(.sysroot)?.asSingle {
-          commandLine.appendFlag("--sysroot")
-          try commandLine.appendPath(VirtualPath(path: sysroot))
-        } else if let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env) {
-          commandLine.appendFlag("--sysroot")
-          try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
-        }
+      if let sysroot = parsedOptions.getLastArgument(.sysroot)?.asSingle {
+        commandLine.appendFlag("--sysroot")
+        try commandLine.appendPath(VirtualPath(path: sysroot))
+      } else if targetTriple.environment == .android,
+        let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env)
+      {
+        commandLine.appendFlag("--sysroot")
+        try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
       } else if let path = targetInfo.sdkPath?.path {
         commandLine.appendFlag("--sysroot")
         commandLine.appendPath(VirtualPath.lookup(path))

Sources/SwiftDriver/Toolchains/GenericUnixToolchain.swift

@@ -152,17 +152,16 @@ public final class GenericUnixToolchain: Toolchain {
     frontendTargetInfo: FrontendTargetInfo,
     driver: inout Driver
   ) throws {
-    if driver.targetTriple.environment == .android {
-      if let sysroot = driver.parsedOptions.getLastArgument(.sysroot)?.asSingle {
-        commandLine.appendFlag("-sysroot")
-        try commandLine.appendPath(VirtualPath(path: sysroot))
-      } else if let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env) {
-        commandLine.appendFlag("-sysroot")
-        try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
-      }
+    if let sysroot = driver.parsedOptions.getLastArgument(.sysroot)?.asSingle {
+      commandLine.appendFlag("-sysroot")
+      try commandLine.appendPath(VirtualPath(path: sysroot))
+    } else if driver.targetTriple.environment == .android,
+      let sysroot = AndroidNDK.getDefaultSysrootPath(in: self.env)
+    {
+      commandLine.appendFlag("-sysroot")
+      try commandLine.appendPath(VirtualPath(path: sysroot.pathString))
     }
 
-
     if driver.targetTriple.os == .openbsd && driver.targetTriple.arch == .aarch64 {
       commandLine.appendFlag(.Xcc)
       commandLine.appendFlag("-Xclang=-msign-return-address=non-leaf")

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -7908,7 +7908,7 @@ final class SwiftDriverTests: XCTestCase {
       do {
         let sysroot = path.appending(component: "sysroot")
         var driver = try Driver(args: [
-          "swiftc", "-target", "aarch64-unknown-linux-android", "-sysroot", sysroot.pathString, #file
+          "swiftc", "-target", "aarch64-unknown-linux-gnu", "-sysroot", sysroot.pathString, #file
         ], env: env)
         let jobs = try driver.planBuild().removingAutolinkExtractJobs()
         let frontend = try XCTUnwrap(jobs.first)