Merge pull request #8471 from crayxt/patch-8

JITMemoryManager header file removed from llvm-svn.
JuliaLang · Sep 25, 2014 · 6d7c7c6 · 6d7c7c6
2 parents 5bc820e + 4cf419d
commit 6d7c7c6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -24,7 +24,6 @@
 #endif
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/JITEventListener.h"
-#include "llvm/ExecutionEngine/JITMemoryManager.h"
 #include "llvm/PassManager.h"
 #include "llvm/Target/TargetLibraryInfo.h"
 #include "llvm/Support/TargetRegistry.h"
@@ -38,6 +37,8 @@
 #endif
 #if defined(LLVM_VERSION_MAJOR) && LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 6
 #define LLVM36 1
+#else
+#include "llvm/ExecutionEngine/JITMemoryManager.h"
 #endif
 #if defined(LLVM_VERSION_MAJOR) && LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 5
 #define LLVM35 1