Merge pull request swiftlang#25312 from kelhutch17/sr-20

SR-20 Update swift --help to explain multitool support ("swift build"…, etc.)

Author: jrose-apple

lib/Driver/Driver.cpp

@@ -3059,6 +3059,20 @@ void Driver::printHelp(bool ShowHidden) const {
   getOpts().PrintHelp(llvm::outs(), Name.c_str(), "Swift compiler",
                       IncludedFlagsBitmask, ExcludedFlagsBitmask,
                       /*ShowAllAliases*/false);
+
+  // These strings match the descriptions found in the corresponding swiftpm 
+  // help pages
+  if (driverKind == DriverKind::Interactive) {
+    llvm::outs() << "\nSEE ALSO - PACKAGE MANAGER COMMANDS: \n"
+        "\t\"swift build\" Build sources into binary products \n"
+        "\t\"swift package\" Perform operations on Swift packages \n"
+        "\t\"swift run\" Build and run an executable product \n"
+        "\t\"swift test\" Build and run tests \n";
+  } else {
+    llvm::outs() << "\nSEE ALSO: swift build, swift run, swift package, " 
+                    "swift test \n";
+  }
+
 }
 
 bool OutputInfo::mightHaveExplicitPrimaryInputs(

test/Driver/help.swift

@@ -21,3 +21,8 @@
 
 // Options marked "help-hidden" should not show up here.
 // NEGATIVE-NOT: -parse-stdlib
+
+// CHECK-SWIFTC: SEE ALSO: swift build, swift run, swift package, swift test
+// NEGATIVE-SWIFTC-NOT: SEE ALSO - PACKAGE MANAGER COMMANDS:
+// CHECK-SWIFT: SEE ALSO - PACKAGE MANAGER COMMANDS:
+// NEGATIVE-SWIFT-NOT: SEE ALSO: swift build, swift run, swift package, swift test