diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-10-30 00:13:16 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-10-30 00:13:16 +0000 |
commit | d2d4d68a58898c5d13d66d45a5d9440fc1d790fe (patch) | |
tree | 7ce04883b59718141cd4fafab5bfbd1a7d08b277 /lib/Driver/Driver.cpp | |
parent | bf69d7146acaea1502d8e10bfe8d4ffe72a83e79 (diff) |
In the past "production" clang builds would not be used for c++, and
we had the -ccc-clang-cxx and -ccc-no-clang-cxx options to force them
on or off for testing.
Clang c++ support is now production quality and these options are dead.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@166986 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Driver.cpp')
-rw-r--r-- | lib/Driver/Driver.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 29202b5411..f8b923286e 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -58,7 +58,7 @@ Driver::Driver(StringRef ClangExecutable, CCCIsCPP(false),CCCEcho(false), CCCPrintBindings(false), CCPrintOptions(false), CCPrintHeaders(false), CCLogDiagnostics(false), CCGenDiagnostics(false), CCCGenericGCCName(""), CheckInputsExist(true), - CCCUseClang(true), CCCUseClangCXX(true), CCCUseClangCPP(true), + CCCUseClang(true), CCCUseClangCPP(true), ForcedClangUse(false), CCCUsePCH(true), SuppressMissingInputWarning(false) { Name = llvm::sys::path::stem(ClangExecutable); @@ -275,9 +275,6 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) { CCCEcho = Args->hasArg(options::OPT_ccc_echo); if (const Arg *A = Args->getLastArg(options::OPT_ccc_gcc_name)) CCCGenericGCCName = A->getValue(*Args); - CCCUseClangCXX = Args->hasFlag(options::OPT_ccc_clang_cxx, - options::OPT_ccc_no_clang_cxx, - CCCUseClangCXX); CCCUsePCH = Args->hasFlag(options::OPT_ccc_pch_is_pch, options::OPT_ccc_pch_is_pth); CCCUseClang = !Args->hasArg(options::OPT_ccc_no_clang); @@ -1797,12 +1794,6 @@ bool Driver::ShouldUseClangCompiler(const Compilation &C, const JobAction &JA, } else if (!isa<PrecompileJobAction>(JA) && !isa<CompileJobAction>(JA)) return false; - // Use clang for C++? - if (!CCCUseClangCXX && types::isCXX((*JA.begin())->getType())) { - Diag(clang::diag::warn_drv_not_using_clang_cxx); - return false; - } - return true; } |