diff options
| -rw-r--r-- | lib/Driver/Compilation.cpp | 1 | ||||
| -rw-r--r-- | lib/Driver/Driver.cpp | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/Driver/Compilation.cpp b/lib/Driver/Compilation.cpp index da589b9d5b..86e617211f 100644 --- a/lib/Driver/Compilation.cpp +++ b/lib/Driver/Compilation.cpp @@ -329,6 +329,7 @@ void Compilation::initCompilationForDiagnostics() { // Clear temporary/results file lists. TempFiles.clear(); ResultFiles.clear(); + FailureResultFiles.clear(); // Remove any user specified output. Claim any unclaimed arguments, so as // to avoid emitting warnings about unused args. diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 0ba61a3de8..3ede6e3288 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -398,6 +398,12 @@ void Driver::generateCompilationDiagnostics(Compilation &C, } } + if (Inputs.empty()) { + Diag(clang::diag::note_drv_command_failed_diag_msg) + << "Error generating preprocessed source(s) - no preprocessable inputs."; + return; + } + // Don't attempt to generate preprocessed files if multiple -arch options are // used, unless they're all duplicates. llvm::StringSet<> ArchNames; @@ -416,12 +422,6 @@ void Driver::generateCompilationDiagnostics(Compilation &C, return; } - if (Inputs.empty()) { - Diag(clang::diag::note_drv_command_failed_diag_msg) - << "Error generating preprocessed source(s) - no preprocessable inputs."; - return; - } - // Construct the list of abstract actions to perform for this compilation. On // Darwin OSes this uses the driver-driver and builds universal actions. const ToolChain &TC = C.getDefaultToolChain(); |