diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-01-21 00:05:15 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-01-21 00:05:15 +0000 |
| commit | f93ebd9f1b4470cbd189a6d9331ceaf073e6a2f7 (patch) | |
| tree | f3eccec07d2c56226dee94c90e3809037ad0db25 | |
| parent | ea9c26b3dbd74a1497f5609ae6e19a85f42b6073 (diff) | |
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
| -rw-r--r-- | tools/ccc/ccclib/Driver.py | 6 | ||||
| -rw-r--r-- | tools/ccc/test/ccc/hello.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/ccc/ccclib/Driver.py b/tools/ccc/ccclib/Driver.py index c17d272795..65b53166a7 100644 --- 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 9563fd04fe..6b857b519a 100644 --- 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" |