diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-10-30 23:49:11 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-10-30 23:49:11 +0000 |
| commit | e6c3458723d954d1ba9b73a2d93d2e2d67dd3510 (patch) | |
| tree | 46b266fc8014b165fe86e5c8b6fbd2f958504bd8 /lib/Driver/Driver.cpp | |
| parent | 82c6dc72adc30e785ce5bc6e8b43ae92070d2e08 (diff) | |
Remove ccc-no-clang-cpp, which is also dead now.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167062 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Driver.cpp')
| -rw-r--r-- | lib/Driver/Driver.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index f8b923286e..d2aacabac9 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), CCCUseClangCPP(true), + CCCUseClang(true), ForcedClangUse(false), CCCUsePCH(true), SuppressMissingInputWarning(false) { Name = llvm::sys::path::stem(ClangExecutable); @@ -278,7 +278,6 @@ Compilation *Driver::BuildCompilation(ArrayRef<const char *> ArgList) { CCCUsePCH = Args->hasFlag(options::OPT_ccc_pch_is_pch, options::OPT_ccc_pch_is_pth); CCCUseClang = !Args->hasArg(options::OPT_ccc_no_clang); - CCCUseClangCPP = !Args->hasArg(options::OPT_ccc_no_clang_cpp); // FIXME: DefaultTargetTriple is used by the target-prefixed calls to as/ld // and getToolChain is const. if (const Arg *A = Args->getLastArg(options::OPT_target)) @@ -1786,12 +1785,8 @@ bool Driver::ShouldUseClangCompiler(const Compilation &C, const JobAction &JA, return false; // Otherwise make sure this is an action clang understands. - if (isa<PreprocessJobAction>(JA)) { - if (!CCCUseClangCPP) { - Diag(clang::diag::warn_drv_not_using_clang_cpp); - return false; - } - } else if (!isa<PrecompileJobAction>(JA) && !isa<CompileJobAction>(JA)) + if (!isa<PreprocessJobAction>(JA) && !isa<PrecompileJobAction>(JA) && + !isa<CompileJobAction>(JA)) return false; return true; |