diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticCommonKinds.td | 2 | ||||
| -rw-r--r-- | clang/lib/Frontend/CompilerInstance.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/DiagnosticCommonKinds.td b/clang/include/clang/Basic/DiagnosticCommonKinds.td index 837fc6126e8..f3fdeb283ce 100644 --- a/clang/include/clang/Basic/DiagnosticCommonKinds.td +++ b/clang/include/clang/Basic/DiagnosticCommonKinds.td @@ -89,7 +89,7 @@ def err_module_unavailable : Error< def err_module_header_missing : Error< "%select{|umbrella }0header '%1' not found">; def err_module_lock_failure : Error< - "could not acquire lock file for module '%0'">, DefaultFatal; + "could not acquire lock file for module '%0': %1">, DefaultFatal; def err_module_lock_timeout : Error< "timed out waiting to acquire lock file for module '%0'">, DefaultFatal; def err_module_cycle : Error<"cyclic dependency in module '%0': %1">, diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index 5648b90be80..64f571e17a0 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -1086,7 +1086,7 @@ static bool compileAndLoadModule(CompilerInstance &ImportingInstance, switch (Locked) { case llvm::LockFileManager::LFS_Error: Diags.Report(ModuleNameLoc, diag::err_module_lock_failure) - << Module->Name; + << Module->Name << Locked.getErrorMessage(); return false; case llvm::LockFileManager::LFS_Owned: |
