Merge pull request #8260 from crayxt/patch-4

Unbreak the LLVM36 build.
JuliaLang · Sep 7, 2014 · c37c2f3 · c37c2f3
2 parents beca3e4 + fe03e6c
commit c37c2f3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -4656,7 +4656,7 @@ extern "C" void jl_init_codegen(void)
         .setJITMemoryManager(new JITMemoryManagerWin())
 #endif
         .setTargetOptions(options)
-#ifdef USE_MCJIT
+#if defined(USE_MCJIT) && !defined(LLVM36)
         .setUseMCJIT(true)
 #endif
     ;