Mesa (master): clover: Fix build after clang r348827

[GitLab Mirror]

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

Author: Jan Vesely <jan.vesely at rutgers.edu>
Date:   Thu Dec 13 15:53:42 2018 -0500

clover: Fix build after clang r348827

CodeGenOptions were moved to Basic.

Signed-off-by: Jan Vesely <jan.vesely at rutgers.edu>
Reviewed-by: Aaron Watry <awatry at gmail.com>
Tested-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Kai Wasserbäch <kai at dev.carbon-project.org>
CC: mesa-stable at lists.freedesktop.org

---

 src/gallium/state_trackers/clover/llvm/compat.hpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 975012cbda..b91cb95a29 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -58,9 +58,14 @@
 #include <llvm/Analysis/TargetLibraryInfo.h>
 
 #include <clang/Basic/TargetInfo.h>
-#include <clang/Frontend/CodeGenOptions.h>
 #include <clang/Frontend/CompilerInstance.h>
 
+#if HAVE_LLVM >= 0x0800
+#include <clang/Basic/CodeGenOptions.h>
+#else
+#include <clang/Frontend/CodeGenOptions.h>
+#endif
+
 namespace clover {
    namespace llvm {
       namespace compat {