summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver
diff options
context:
space:
mode:
authorFrancois Pichet <pichet2000@gmail.com>2011-09-01 16:38:08 +0000
committerFrancois Pichet <pichet2000@gmail.com>2011-09-01 16:38:08 +0000
commit0274487d97fa4daa8478b05dbc2e5fed9ce00493 (patch)
treed97d234b30c9732c258e7e5d8d7c6e141e5faee1 /clang/lib/Driver
parent5f344fff089dd7685bd0013ef6f03b318819b334 (diff)
downloadbcm5719-llvm-0274487d97fa4daa8478b05dbc2e5fed9ce00493.tar.gz
bcm5719-llvm-0274487d97fa4daa8478b05dbc2e5fed9ce00493.zip
Enable -fdelayed-template-parsing by default on Win32.
I had to force -fno-delayed-template-parsing on some Index tests because delayed template parsing will change the output of some tests. llvm-svn: 138942
Diffstat (limited to 'clang/lib/Driver')
-rw-r--r--clang/lib/Driver/Tools.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 1486065411d..4901bc27045 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -1782,10 +1782,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
options::OPT_fno_borland_extensions, false))
CmdArgs.push_back("-fborland-extensions");
- // -fno-delayed-template-parsing is default.
+ // -fno-delayed-template-parsing is default, except for Windows where MSVC STL
+ // needs it.
if (Args.hasFlag(options::OPT_fdelayed_template_parsing,
options::OPT_fno_delayed_template_parsing,
- false))
+ getToolChain().getTriple().getOS() == llvm::Triple::Win32))
CmdArgs.push_back("-fdelayed-template-parsing");
// -fgnu-keywords default varies depending on language; only pass if
OpenPOWER on IntegriCloud