commit 105132e7222bdad1e85704e055ab9c8b23a1eac0
author Daniel Dunbar <daniel@zuster.org> Fri Jan 16 21:07:21 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Fri Jan 16 21:07:21 2009 +0000
tree 569d1cbe8e0edd92e281845b639ae9847a9eab95
parent ebff1fed660fac9c50a7b7571da797bb489254a4

ccc: Darwin/X86: gcc compatibility, only add
'-feliminate-unused-debug-symbols' in reponse to '-g' (not '-g*').


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62357 91177308-0d34-0410-b5e6-96231b3b80d8

tools/ccc/ccclib/Arguments.py

diff --git a/tools/ccc/ccclib/Arguments.py b/tools/ccc/ccclib/Arguments.py
index 4a7581a..075d3b9 100644
--- a/tools/ccc/ccclib/Arguments.py
+++ b/tools/ccc/ccclib/Arguments.py
@@ -721,7 +721,9 @@
         self.gstabsOption = self.addOption(JoinedOption('-gstabs', self.gGroup))
         self.g0Option = self.addOption(JoinedOption('-g0', self.gGroup))
         self.g3Option = self.addOption(JoinedOption('-g3', self.gGroup))
-        self.gOption = self.addOption(JoinedOption('-g', self.gGroup))
+        # FIXME: Naming.
+        self.gOption = self.addOption(FlagOption('-g', self.gGroup))
+        self.addOption(JoinedOption('-g', self.gGroup))
 
         # FIXME: How should we handle clang specific options? Do we
         # want to avoid passing them to gcc/cc1 (which will generally

tools/ccc/ccclib/Tools.py

diff --git a/tools/ccc/ccclib/Tools.py b/tools/ccc/ccclib/Tools.py
index ce87d38..da25867 100644
--- a/tools/ccc/ccclib/Tools.py
+++ b/tools/ccc/ccclib/Tools.py
@@ -326,7 +326,7 @@
         # FIXME: Remove mcpu=G4
         # FIXME: Remove mcpu=G5
 
-        if (arglist.getLastArg(arglist.parser.gGroup) and
+        if (arglist.getLastArg(arglist.parser.gOption) and
             not arglist.getLastArg(arglist.parser.f_noEliminateUnusedDebugSymbolsOption)):
             cmd_args.append('-feliminate-unused-debug-symbols')