Merge pull request #21027 from compnerd/save-the-environment

IDE: preserve the environment in the triple

Author: compnerd

lib/IDE/Utils.cpp

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