maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Driver: Executing piped jobs with a single command is easy. 

llvm-svn: 67295
This commit is contained in:
Daniel Dunbar 2009-03-19 08:01:45 +00:00
parent adc5c7c2fd
commit 1da82ae5bd
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/Driver/Compilation.h
View File

@ -109,6 +109,11 @@ private:
void PrintJob(llvm::raw_ostream &OS, const Job &J,
const char *Terminator, bool Quote) const;
/// ExecuteCommand - Execute an actual command.
///
/// \return The result code of the subprocess.
int ExecuteCommand(const Command &C) const;
/// ExecuteJob - Execute a single job.
///
/// \return The accumulated result code of the job.

53
clang/lib/Driver/Compilation.cpp
View File

@ -108,32 +108,39 @@ bool Compilation::CleanupFileList(const ArgStringList &Files,
return Success;
}
int Compilation::ExecuteCommand(const Command &C) const {
llvm::sys::Path Prog(C.getExecutable());
const char **Argv = new const char*[C.getArguments().size() + 2];
Argv[0] = C.getExecutable();
std::copy(C.getArguments().begin(), C.getArguments().end(), Argv+1);
Argv[C.getArguments().size() + 1] = 0;
if (getDriver().CCCEcho || getArgs().hasArg(options::OPT_v))
PrintJob(llvm::errs(), C, "\n", false);
std::string Error;
int Res =
llvm::sys::Program::ExecuteAndWait(Prog, Argv,
/*env*/0, /*redirects*/0,
/*secondsToWait*/0, /*memoryLimit*/0,
&Error);
if (!Error.empty()) {
assert(Res && "Error string set with 0 result code!");
getDriver().Diag(clang::diag::err_drv_command_failure) << Error;
}
delete[] Argv;
return Res;
}
int Compilation::ExecuteJob(const Job &J) const {
if (const Command *C = dyn_cast<Command>(&J)) {
llvm::sys::Path Prog(C->getExecutable());
const char **Argv = new const char*[C->getArguments().size() + 2];
Argv[0] = C->getExecutable();
std::copy(C->getArguments().begin(), C->getArguments().end(), Argv+1);
Argv[C->getArguments().size() + 1] = 0;
if (getDriver().CCCEcho || getArgs().hasArg(options::OPT_v))
PrintJob(llvm::errs(), J, "\n", false);
std::string Error;
int Res =
llvm::sys::Program::ExecuteAndWait(Prog, Argv,
/*env*/0, /*redirects*/0,
/*secondsToWait*/0, /*memoryLimit*/0,
&Error);
if (!Error.empty()) {
assert(Res && "Error string set with 0 result code!");
getDriver().Diag(clang::diag::err_drv_command_failure) << Error;
}
delete[] Argv;
return Res;
return ExecuteCommand(*C);
} else if (const PipedJob *PJ = dyn_cast<PipedJob>(&J)) {
(void) PJ;
// Piped commands with a single job are easy.
if (PJ->size() == 1)
return ExecuteCommand(**PJ->begin());
getDriver().Diag(clang::diag::err_drv_unsupported_opt) << "-pipe";
return 1;
} else {