Mesa (master): clover: Fix build with clang 3.2

Tom Stellard tstellar at kemper.freedesktop.org
Fri Nov 16 22:31:19 UTC 2012


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

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Mon Nov 12 16:04:03 2012 +0000

clover: Fix build with clang 3.2

---

 .../state_trackers/clover/llvm/invocation.cpp      |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 521f998..2b07053 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -132,7 +132,12 @@ namespace {
                                         clang::LangStandard::lang_opencl11);
 #endif
       c.createDiagnostics(0, NULL, new clang::TextDiagnosticPrinter(
-                          s_log, c.getDiagnosticOpts()));
+                          s_log,
+#if HAVE_LLVM <= 0x0301
+                                 c.getDiagnosticOpts()));
+#else
+                                 &c.getDiagnosticOpts()));
+#endif
 
       c.getPreprocessorOpts().addRemappedFile(name,
                                       llvm::MemoryBuffer::getMemBuffer(source));




More information about the mesa-commit mailing list