[Mesa-dev] [PATCH] clover: Fix build against LLVM SVN r203065 or newer

Michel Dänzer michel at daenzer.net
Thu Mar 6 17:49:59 PST 2014


From: Michel Dänzer <michel.daenzer at amd.com>

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

Signed-off-by: Michel Dänzer <michel.daenzer 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>
-- 
1.9.0



More information about the mesa-dev mailing list