Merge pull request #2645 from yahoo/balder/clean-up-llvm-conditionally

Add support for conditionally running available shutdown.

1 files changed, 5 insertions, 0 deletions

diff --git a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp
index fa3cbfdbb58..4a0aef82f6b 100644
--- a/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp
+++ b/eval/src/vespa/eval/eval/llvm/llvm_wrapper.cpp
@@ -629,7 +629,12 @@ struct InitializeNativeTarget {
     }
     ~InitializeNativeTarget() {
         llvm::llvm_shutdown();
+#ifdef HAS_LLVM_DESTROY_STATIC_MUTEX
         llvm::llvm_destroy_static_mutex();
+#endif
+#ifdef HAS_LLVM_DESTROY_OPENED_HANDLES
+        llvm::llvm_destroy_opened_handles();
+#endif
     }
 } initialize_native_target;