summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2017-09-25 19:24:45 +0000
committerMartin Storsjo <martin@martin.st>2017-09-25 19:24:45 +0000
commit68c730a1b22b0f1a3015b9b3f49b53f84539164a (patch)
tree457a53fe1e3703fe339e2e53bcabcc7a09005d94 /clang/lib
parentb3aec7a63681e40c8d2851747643c83314e13bea (diff)
downloadbcm5719-llvm-68c730a1b22b0f1a3015b9b3f49b53f84539164a.tar.gz
bcm5719-llvm-68c730a1b22b0f1a3015b9b3f49b53f84539164a.zip
[MinGW] Don't link -lmsvcrt if a different msvcrt version is to be linked
Differential Revision: https://reviews.llvm.org/D37530 llvm-svn: 314138
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Driver/ToolChains/MinGW.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Driver/ToolChains/MinGW.cpp b/clang/lib/Driver/ToolChains/MinGW.cpp
index 46e2289219c..660b0c798ec 100644
--- a/clang/lib/Driver/ToolChains/MinGW.cpp
+++ b/clang/lib/Driver/ToolChains/MinGW.cpp
@@ -82,6 +82,9 @@ void tools::MinGW::Linker::AddLibGCC(const ArgList &Args,
CmdArgs.push_back("-lmoldname");
CmdArgs.push_back("-lmingwex");
+ for (auto Lib : Args.getAllArgValues(options::OPT_l))
+ if (StringRef(Lib).startswith("msvcr") || Lib == "ucrtbase")
+ return;
CmdArgs.push_back("-lmsvcrt");
}
OpenPOWER on IntegriCloud