diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-08-21 17:32:13 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-08-21 17:32:13 -0700 |
| commit | 66f271497ed92ebb05c66f54616e512606a2e314 (patch) | |
| tree | 96d54cd64804ab7c9f2f52f680c3301aa789ce1d /lib/ExecutionEngine/ExecutionEngine.cpp | |
| parent | b62e9abf7dd9e39c95327914ce9dfe216386824a (diff) | |
| parent | bc363931085587bac42a40653962a3e5acd1ffce (diff) | |
Merge up to r162331, git commit bc363931085587bac42a40653962a3e5acd1ffce
Diffstat (limited to 'lib/ExecutionEngine/ExecutionEngine.cpp')
| -rw-r--r-- | lib/ExecutionEngine/ExecutionEngine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp index a744d0c1e7..4afc900f64 100644 --- a/lib/ExecutionEngine/ExecutionEngine.cpp +++ b/lib/ExecutionEngine/ExecutionEngine.cpp @@ -501,7 +501,8 @@ ExecutionEngine *EngineBuilder::create(TargetMachine *TM) { return 0; } - if ((WhichEngine & EngineKind::JIT) && ExecutionEngine::JITCtor == 0) { + if ((WhichEngine & EngineKind::JIT) && ExecutionEngine::JITCtor == 0 && + ExecutionEngine::MCJITCtor == 0) { if (ErrorStr) *ErrorStr = "JIT has not been linked in."; } |