commit 1b52d8c4ecc362a59d8dd9c0ee53bc9c2f3b009d
author Daniel Dunbar <daniel@zuster.org> Sat Dec 05 00:13:59 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Sat Dec 05 00:13:59 2009 +0000
tree e0825750e9de5be0b9d5e8a41db93f9f0cd19d97
parent e79368d3ffb633a60449985b591855094cb82933

Unbreak -ccc-cxx and -ccc-clang-cxx defaulting.

llvm-svn: 90629

clang/lib/Driver/Driver.cpp

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index 672c890..c404e76 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -124,12 +124,13 @@
   CCCPrintOptions = Args->hasArg(options::OPT_ccc_print_options);
   CCCPrintActions = Args->hasArg(options::OPT_ccc_print_phases);
   CCCPrintBindings = Args->hasArg(options::OPT_ccc_print_bindings);
-  CCCIsCXX = Args->hasArg(options::OPT_ccc_cxx);
+  CCCIsCXX = Args->hasArg(options::OPT_ccc_cxx) || CCCIsCXX;
   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);
+                                 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);