diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:23:10 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-21 15:23:10 -0700 |
| commit | d14fb2f0d6d6e6ccba713ed9605eb6c83a7d9c4f (patch) | |
| tree | 97865976d3a66f2e972637f2d60c4c653cf1b95f /src/rustllvm/ExecutionEngineWrapper.cpp | |
| parent | 6b1ce4957401d561da02973260b58a4fe58a1ebc (diff) | |
| parent | ba276adab596bafe48a27dc02dcc5867446a52b5 (diff) | |
| download | rust-d14fb2f0d6d6e6ccba713ed9605eb6c83a7d9c4f.tar.gz rust-d14fb2f0d6d6e6ccba713ed9605eb6c83a7d9c4f.zip | |
rollup merge of #24635: tamird/llvm-3.5
r? @alexcrichton
Diffstat (limited to 'src/rustllvm/ExecutionEngineWrapper.cpp')
| -rw-r--r-- | src/rustllvm/ExecutionEngineWrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rustllvm/ExecutionEngineWrapper.cpp b/src/rustllvm/ExecutionEngineWrapper.cpp index 8ca81ab3d68..7e0630fd242 100644 --- a/src/rustllvm/ExecutionEngineWrapper.cpp +++ b/src/rustllvm/ExecutionEngineWrapper.cpp @@ -89,12 +89,12 @@ extern "C" LLVMExecutionEngineRef LLVMBuildExecutionEngine( options.NoFramePointerElim = true; ExecutionEngine *ee = - #if LLVM_VERSION_MINOR <= 5 - EngineBuilder(unwrap(mod)) - .setMCJITMemoryManager(unwrap(mref)) - #else + #if LLVM_VERSION_MINOR >= 6 EngineBuilder(std::unique_ptr<Module>(unwrap(mod))) .setMCJITMemoryManager(std::unique_ptr<RustJITMemoryManager>(unwrap(mref))) + #else + EngineBuilder(unwrap(mod)) + .setMCJITMemoryManager(unwrap(mref)) #endif .setEngineKind(EngineKind::JIT) .setErrorStr(&error_str) |