Mesa (master): clover: Fix build against LLVM SVN r203065 or newer

Michel Dänzer daenzer at kemper.freedesktop.org
Fri Mar 7 02:16:27 UTC 2014


Module: Mesa
Branch: master
Commit: 9ceee5f4be09702fc881c922b5ad489cd03c76f8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ceee5f4be09702fc881c922b5ad489cd03c76f8

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Mar  7 10:49:30 2014 +0900

clover: Fix build against LLVM SVN r203065 or newer

llvm/Linker.h was moved to llvm/Linker/Linker.h.

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/state_trackers/clover/llvm/invocation.cpp |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index a9ac83b..a81bdf8 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -29,7 +29,11 @@
 #include <clang/Basic/TargetInfo.h>
 #include <llvm/Bitcode/BitstreamWriter.h>
 #include <llvm/Bitcode/ReaderWriter.h>
+#if HAVE_LLVM < 0x0305
 #include <llvm/Linker.h>
+#else
+#include <llvm/Linker/Linker.h>
+#endif
 #if HAVE_LLVM < 0x0303
 #include <llvm/DerivedTypes.h>
 #include <llvm/LLVMContext.h>




More information about the mesa-commit mailing list