diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-03-26 16:12:09 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-03-26 16:12:09 +0000 |
| commit | dd76524d76b75140c5685bcf57c34aa04eb4d9a3 (patch) | |
| tree | 20d17b0188d901ad7b193a78801128a3563d44c6 /clang/lib/Driver/Driver.cpp | |
| parent | b1024880f118fb426d1bffeb92aa9645454f30a3 (diff) | |
| download | bcm5719-llvm-dd76524d76b75140c5685bcf57c34aa04eb4d9a3.tar.gz bcm5719-llvm-dd76524d76b75140c5685bcf57c34aa04eb4d9a3.zip | |
Driver: Fix a number of option definition mismatches (flags instead of
separate, or vice versa).
Also, fix initialization of LinkingOutput variable.
llvm-svn: 67757
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 94b33ff61fd..6202702f097 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -547,7 +547,7 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const { // Reject -Z* at the top level, these options should never have been // exposed by gcc. - if (Arg *A = Args.getLastArg(options::OPT_Z)) + if (Arg *A = Args.getLastArg(options::OPT_Z_Joined)) Diag(clang::diag::err_drv_use_of_Z_option) << A->getAsString(Args); // Construct the actions to perform. @@ -693,7 +693,7 @@ void Driver::BuildJobs(Compilation &C) const { // FIXME: This is a hack; find a cleaner way to integrate this // into the process. const char *LinkingOutput = 0; - if (isa<LinkJobAction>(A)) { + if (isa<LipoJobAction>(A)) { if (FinalOutput) LinkingOutput = FinalOutput->getValue(C.getArgs()); else |
