summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2014-03-28 01:19:04 +0000
committerHans Wennborg <hans@hanshq.net>2014-03-28 01:19:04 +0000
commit73609a0fb3d30cd39297d1974b60982550b58edb (patch)
tree269d216ce56f0f2302d7aa66bc390accf82fd114
parent200fce42081a8669d03eb54f76ab60facc81d181 (diff)
downloadbcm5719-llvm-73609a0fb3d30cd39297d1974b60982550b58edb.tar.gz
bcm5719-llvm-73609a0fb3d30cd39297d1974b60982550b58edb.zip
clang-cl wants MSVC-style win32
This should fix the clang-cl tests after the Windows target triple canonicalization (r204978) llvm-svn: 204985
-rw-r--r--clang/lib/Driver/Driver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 914efa638d1..bd3a6e928ed 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -335,9 +335,11 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) {
// FIXME: DefaultTargetTriple is used by the target-prefixed calls to as/ld
// and getToolChain is const.
if (IsCLMode()) {
- // clang-cl targets Win32.
+ // 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));
DefaultTargetTriple = T.str();
}
if (const Arg *A = Args->getLastArg(options::OPT_target))
OpenPOWER on IntegriCloud