Merge pull request swiftlang#21258 from bob-wilson/triple-environment

NFC: Simplify code by using Triple.getOSAndEnvironmentName

Author: bob-wilson

lib/IDE/Utils.cpp

@@ -226,9 +226,8 @@ static std::string adjustClangTriple(StringRef TripleStr) {
     }
     break;
   }
-  OS << '-' << Triple.getVendorName() << '-' << Triple.getOSName();
-  if (Triple.hasEnvironment())
-    OS << '-' << Triple.getEnvironmentName();
+  OS << '-' << Triple.getVendorName() << '-' <<
+      Triple.getOSAndEnvironmentName();
   OS.flush();
   return Result;
 }