diff options
| author | Krasimir Georgiev <krasimir@google.com> | 2021-10-05 16:31:36 +0200 |
|---|---|---|
| committer | Krasimir Georgiev <krasimir@google.com> | 2021-10-05 16:31:36 +0200 |
| commit | 67a82e20cfdc6119f65ddfbfa179d0b5426ee753 (patch) | |
| tree | 3587fcf30c7bcd3065ff8b6664ed7ece5afa7381 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 55111d656f7ecd511ebfad09d3b4b41e44cbcc23 (diff) | |
| download | rust-67a82e20cfdc6119f65ddfbfa179d0b5426ee753.tar.gz rust-67a82e20cfdc6119f65ddfbfa179d0b5426ee753.zip | |
RustWrapper: adapt for LLVM API change of fatal_error_handler_t
No functional changes intended. The LLVM commit https://github.com/llvm/llvm-project/commit/e463b69736da8b0a950ecd937cf990401bdfcdeb changed an argument of fatal_error_handler_t from std::string to char*. This adapts RustWrapper accordingly.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 9850f395a0f..97114729c0a 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -54,7 +54,11 @@ static LLVM_THREAD_LOCAL char *LastError; // // Notably it exits the process with code 101, unlike LLVM's default of 1. static void FatalErrorHandler(void *UserData, +#if LLVM_VERSION_LT(14, 0) const std::string& Reason, +#else + const char* Reason, +#endif bool GenCrashDiag) { // Do the same thing that the default error handler does. std::cerr << "LLVM ERROR: " << Reason << std::endl; |
