Simplify clang-cl's target triple setting

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@205051 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index bd3a6e928ed5cc0598e7a3e1760384b6ec1814dd..317b822095056d55c6e98062d4a594294c27dd86 100644 (file)
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -337,9 +337,8 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
   if (IsCLMode()) {
     // clang-cl targets MSVC-style Win32.
     llvm::Triple T(DefaultTargetTriple);
-    T.setOSName(llvm::Triple::getOSTypeName(llvm::Triple::Win32));
-    T.setEnvironmentName(llvm::Triple::getEnvironmentTypeName(
-          llvm::Triple::MSVC));
+    T.setOS(llvm::Triple::Win32);
+    T.setEnvironment(llvm::Triple::MSVC);
     DefaultTargetTriple = T.str();
   }
   if (const Arg *A = Args->getLastArg(options::OPT_target))