Remove <toolchain>/usr/bin/../lib/ from directories passed to linker …

…to look up libraries for target triple (#6824)

Also, update my github username in the mailmap.

Resolves #6767

.mailmap

@@ -101,5 +101,5 @@ Tim Gymnich <[email protected]> <[email protected]>
 Tom Doron <[email protected]> <[email protected]>
 Valeriy Van <[email protected]> <[email protected]>
 Valeriy Van <[email protected]> <[email protected]>
-buttaface <[email protected]> <[email protected]>
-buttaface <[email protected]> <[email protected]>
+finagolfin <[email protected]> <[email protected]>
+finagolfin <[email protected]> <[email protected]>

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -314,14 +314,6 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
             args += ["-L", librarySearchPath.pathString]
         }
 
-        // Add toolchain's libdir at the very end (even after the user -Xlinker arguments).
-        //
-        // This will allow linking to libraries shipped in the toolchain.
-        let toolchainLibDir = try buildParameters.toolchain.toolchainLibDir
-        if self.fileSystem.isDirectory(toolchainLibDir) {
-            args += ["-L", toolchainLibDir.pathString]
-        }
-
         // Library search path for the toolchain's copy of SwiftSyntax.
         #if BUILD_MACROS_AS_DYLIBS
         if product.type == .macro {

Tests/BuildTests/BuildPlanTests.swift

@@ -3518,11 +3518,8 @@ final class BuildPlanTests: XCTestCase {
     }
 
     func testExtraBuildFlags() throws {
-        let libpath = AbsolutePath("/fake/path/lib")
-
         let fs = InMemoryFileSystem(emptyFiles:
             "/A/Sources/exe/main.swift",
-            libpath.appending(components: "libSomething.dylib").pathString,
             "<end>"
         )
 
@@ -3553,7 +3550,7 @@ final class BuildPlanTests: XCTestCase {
         ))
 
         let exe = try result.buildProduct(for: "exe").linkArguments()
-        XCTAssertMatch(exe, [.anySequence, "-L", "/path/to/foo", "-L/path/to/foo", "-Xlinker", "-rpath=foo", "-Xlinker", "-rpath", "-Xlinker", "foo", "-L", "\(libpath)"])
+        XCTAssertMatch(exe, [.anySequence, "-L", "/path/to/foo", "-L/path/to/foo", "-Xlinker", "-rpath=foo", "-Xlinker", "-rpath", "-Xlinker", "foo"])
     }
 
     func testUserToolchainCompileFlags() throws {