ccc: Unbreak -pipe handling broken in previous refactoring.

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

diff --git a/tools/ccc/ccclib/Driver.py b/tools/ccc/ccclib/Driver.py
index c17d272795a9640c138d1b2ea378fcd3ffb3d6fe..65b53166a7f64d3197ffc110d8d54f2615e47262 100644 (file)
--- a/tools/ccc/ccclib/Driver.py
+++ b/tools/ccc/ccclib/Driver.py
@@ -685,8 +685,8 @@ class Driver(object):
                 jobList = inputs[0].source
                 
             baseInput = inputs[0].baseInput
-            output = self.getOutputName(phase, outputToPipe, jobs, jobList, baseInput, 
-                                        args, atTopLevel, hasSaveTemps, finalOutput)
+            output,jobList = self.getOutputName(phase, outputToPipe, jobs, jobList, baseInput, 
+                                                args, atTopLevel, hasSaveTemps, finalOutput)
             tool.constructJob(phase, arch, jobList, inputs, output, phase.type,
                               tcArgs, linkingOutput)
 
@@ -762,4 +762,4 @@ class Driver(object):
                 fd,filename = tempfile.mkstemp(suffix='.'+phase.type.tempSuffix)
                 output = args.makeSeparateArg(filename,
                                               self.parser.oOption)
-        return output
+        return output,jobList

diff --git a/tools/ccc/test/ccc/hello.c b/tools/ccc/test/ccc/hello.c
index 9563fd04fe01ac613f1de3acfeda8ce8fcb21a94..6b857b519a4bf4b5040b1fc1095186dd49a4f66e 100644 (file)
--- a/tools/ccc/test/ccc/hello.c
+++ b/tools/ccc/test/ccc/hello.c
@@ -1,5 +1,7 @@
 // RUN: xcc %s -o %t &&
 // RUN: %t | grep "Hello, World" &&
+// RUN: xcc %s -o %t -pipe &&
+// RUN: %t | grep "Hello, World" &&
 // RUN: xcc -ccc-clang %s -o %t &&
 // RUN: %t | grep "Hello, World"