]> granicus.if.org Git - clang/commitdiff
ccc: Support running piped jobs (-pipe now works).
authorDaniel Dunbar <daniel@zuster.org>
Sat, 17 Jan 2009 02:02:35 +0000 (02:02 +0000)
committerDaniel Dunbar <daniel@zuster.org>
Sat, 17 Jan 2009 02:02:35 +0000 (02:02 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62396 91177308-0d34-0410-b5e6-96231b3b80d8

tools/ccc/ccclib/Driver.py
tools/ccc/ccclib/Tools.py

index 0f5b226237d6ab8c5a190e60c62906d4d6513e4a..e1cdd2d2f78ffb32444ff4830eb5374943302bce 100644 (file)
@@ -197,7 +197,29 @@ class Driver(object):
                 if res:
                     sys.exit(res)
             elif isinstance(j, Jobs.PipedJob):
-                raise NotImplementedError,"Piped jobs aren't implemented yet."
+                import subprocess
+                procs = []
+                for sj in j.commands:
+                    if self.cccEcho:
+                        print ' '.join(map(repr,sj.getArgv()))
+                        sys.stdout.flush()
+
+                    if not procs:
+                        stdin = None
+                    else:
+                        stdin = procs[-1].stdout
+                    if sj is j.commands[-1]:
+                        stdout = None
+                    else:
+                        stdout = subprocess.PIPE
+                    procs.append(subprocess.Popen(sj.getArgv(), 
+                                                  executable=sj.executable,
+                                                  stdin=stdin,
+                                                  stdout=stdout))
+                for proc in procs:
+                    res = proc.wait()
+                    if res:
+                        sys.exit(res)
             else:
                 raise ValueError,'Encountered unknown job.'
 
@@ -585,7 +607,9 @@ class Driver(object):
         if hasPipe:
             self.claim(hasPipe)
             # FIXME: Hack, override -pipe till we support it.
-            hasPipe = None
+            if hasSaveTemps:
+                self.warning('-pipe ignored because -save-temps specified')
+                hasPipe = None
         # Claim these here. Its not completely accurate but any warnings
         # about these being unused are likely to be noise anyway.
         if hasSaveTemps:
index 8b4efd4a3eaceb67176b0b9a9c70556d3f1cfa6a..667ff7a286d154934d05e0ebf46a7dcea8af158e 100644 (file)
@@ -141,7 +141,7 @@ class Darwin_AssembleTool(Tool):
 
         cmd_args.extend(arglist.render(output))
         if isinstance(input.source, Jobs.PipedJob):
-            cmd_args.append('-')
+            pass
         else:
             cmd_args.extend(arglist.renderAsInput(input.source))