[cfe-commits] r66792 - /cfe/trunk/tools/ccc/ccclib/Driver.py

[Daniel Dunbar]

Author: ddunbar
Date: Thu Mar 12 10:57:47 2009
New Revision: 66792

URL: http://llvm.org/viewvc/llvm-project?rev=66792&view=rev
Log:
ccc: Fix -ccc-print-phases when doing a universal build.

Modified:
    cfe/trunk/tools/ccc/ccclib/Driver.py

Modified: cfe/trunk/tools/ccc/ccclib/Driver.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/ccc/ccclib/Driver.py?rev=66792&r1=66791&r2=66792&view=diff

==============================================================================
--- cfe/trunk/tools/ccc/ccclib/Driver.py (original)
+++ cfe/trunk/tools/ccc/ccclib/Driver.py Thu Mar 12 10:57:47 2009
@@ -318,15 +318,16 @@
         def printPhase(p, f, steps, arch=None):
             if p in steps:
                 return steps[p]
-            elif isinstance(p, Phases.BindArchAction):
-                for kid in p.inputs:
-                    printPhase(kid, f, steps, p.arch)
-                steps[p] = len(steps)
-                return
 
             if isinstance(p, Phases.InputAction):
                 phaseName = 'input'
                 inputStr = '"%s"' % args.getValue(p.filename)
+            elif isinstance(p, Phases.BindArchAction):
+                phaseName = 'bind-arch'
+                inputs = [printPhase(i, f, steps, p.arch) 
+                          for i in p.inputs]
+                inputStr = '"%s", {%s}' % (args.getValue(p.arch), 
+                                           ', '.join(map(str, inputs)))
             else:
                 phaseName = p.phase.name
                 inputs = [printPhase(i, f, steps, arch)