Mesa (master): clover: Fix build with libclang v3.2

Tom Stellard tstellar at kemper.freedesktop.org
Tue Sep 25 14:40:54 UTC 2012


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

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Mon Sep 24 21:07:55 2012 +0000

clover: Fix build with libclang v3.2

Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

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

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 6ab9025..77b02de 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -120,7 +120,12 @@ namespace {
 
       c.getLangOpts().NoBuiltin = true;
       c.getTargetOpts().Triple = triple;
+#if HAVE_LLVM <= 0x0301
       c.getInvocation().setLangDefaults(clang::IK_OpenCL);
+#else
+      c.getInvocation().setLangDefaults(c.getLangOpts(), clang::IK_OpenCL,
+                                        clang::LangStandard::lang_opencl11);
+#endif
       c.createDiagnostics(0, NULL, new clang::TextDiagnosticPrinter(
                           s_log, c.getDiagnosticOpts()));
 




More information about the mesa-commit mailing list