From 27c39af73c0d7d0b97e57b3a905040d4cefc9708 Mon Sep 17 00:00:00 2001
From: rdivacky <rdivacky@FreeBSD.org>
Date: Wed, 10 Mar 2010 17:45:58 +0000
Subject: Update clang to r98164.

---
 lib/Driver/Tools.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/Driver/Tools.cpp')

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index de9bdcc..bc52100 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -929,7 +929,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   // Special case debug options to only pass -g to clang. This is
   // wrong.
-  if (Args.hasArg(options::OPT_g_Group))
+  Args.ClaimAllArgs(options::OPT_g_Group);
+  Arg *Garg = Args.getLastArg(options::OPT_g_Group);
+  if (Garg && Garg != Args.getLastArg(options::OPT_g0))
     CmdArgs.push_back("-g");
 
   Args.AddLastArg(CmdArgs, options::OPT_nostdinc);
-- 
cgit v1.1