Merge pull request #868 from artemcm/StopNoObjcCategoryMerge

Stop passing `-no_objc_category_merging` to the linker on Darwin.

Author: artemcm

Sources/SwiftDriver/Jobs/DarwinToolchain+LinkerSupport.swift

@@ -418,8 +418,6 @@ extension DarwinToolchain {
       sdkPath: targetInfo.sdkPath?.path
     )
 
-    commandLine.appendFlag("-no_objc_category_merging")
-
     // These custom arguments should be right before the object file at the
     // end.
     try commandLine.appendAllExcept(

Tests/SwiftDriverTests/JobExecutorTests.swift

@@ -183,7 +183,7 @@ final class JobExecutorTests: XCTestCase {
           "-lobjc", "-lSystem", "-arch", .flag(hostTriple.archName),
           "-L", .path(.absolute(try toolchain.resourcesDirectory.get())),
           "-L", .path(.absolute(try toolchain.sdkStdlib(sdk: toolchain.sdk.get()))),
-          "-rpath", "/usr/lib/swift", "-macosx_version_min", "10.14.0", "-no_objc_category_merging", "-o",
+          "-rpath", "/usr/lib/swift", "-macosx_version_min", "10.14.0", "-o",
           .path(.relative(RelativePath("main"))),
         ],
         inputs: [
@@ -254,7 +254,7 @@ final class JobExecutorTests: XCTestCase {
           "-lobjc", "-lSystem", "-arch", .flag(hostTriple.archName),
           "-L", .path(.absolute(try toolchain.resourcesDirectory.get())),
           "-L", .path(.absolute(try toolchain.sdkStdlib(sdk: toolchain.sdk.get()))),
-          "-rpath", "/usr/lib/swift", "-macosx_version_min", "10.14.0", "-no_objc_category_merging",
+          "-rpath", "/usr/lib/swift", "-macosx_version_min", "10.14.0",
           "-o", .path(.absolute(exec)),
         ],
         inputs: [