Fix build to work with LLVM top-of-tree again

2013-01-06 12:02:08 -08:00
parent 2063d34f3e
commit 63dd7d9859
15 changed files with 306 additions and 111 deletions
--- a/llvmutil.cpp
+++ b/llvmutil.cpp
@@ -38,8 +38,13 @@
 #include "llvmutil.h"
 #include "ispc.h"
 #include "type.h"
-#include <llvm/Instructions.h>
-#include <llvm/BasicBlock.h>
+#if defined(LLVM_3_0) || defined(LLVM_3_1) || defined(LLVM_3_2)
+  #include <llvm/Instructions.h>
+  #include <llvm/BasicBlock.h>
+#else
+  #include <llvm/IR/Instructions.h>
+  #include <llvm/IR/BasicBlock.h>
+#endif
 #include <set>
 #include <map>