diff options
| author | bors <bors@rust-lang.org> | 2013-06-15 01:04:05 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-15 01:04:05 -0700 |
| commit | 83d44f87e5fe8935c1f8a5f26409a99286675650 (patch) | |
| tree | 39c02f29ab7f9a40bd2ed2015279a806d5956657 /src/rustllvm/rustllvm.h | |
| parent | 7d1065e913e6d50ddb1a157f81bb7752caeca329 (diff) | |
| parent | 9c3b1cbc19b31537ef1a0a904806ad46c9923f75 (diff) | |
| download | rust-83d44f87e5fe8935c1f8a5f26409a99286675650.tar.gz rust-83d44f87e5fe8935c1f8a5f26409a99286675650.zip | |
auto merge of #7125 : alexcrichton/rust/rusti-issues, r=brson
This un-reverts the reverts of the rusti commits made awhile back. These were reverted for an LLVM failure in rustpkg. I believe that this is not a problem with these commits, but rather that rustc is being used in parallel for rustpkg tests (in-process). This is not working yet (almost! see #7011), so I serialized all the tests to run one after another. @brson, I'm mainly just guessing as to the cause of the LLVM failures in rustpkg tests. I'm confident that running tests in parallel is more likely to be the problem than those commits I made. Additionally, this fixes two recently reported issues with rusti.
Diffstat (limited to 'src/rustllvm/rustllvm.h')
| -rw-r--r-- | src/rustllvm/rustllvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rustllvm/rustllvm.h b/src/rustllvm/rustllvm.h index a66ad3704be..6f11202800c 100644 --- a/src/rustllvm/rustllvm.h +++ b/src/rustllvm/rustllvm.h @@ -45,6 +45,7 @@ #include "llvm/Transforms/Vectorize.h" #include "llvm-c/Core.h" #include "llvm-c/BitReader.h" +#include "llvm-c/ExecutionEngine.h" #include "llvm-c/Object.h" // Used by RustMCJITMemoryManager::getPointerToNamedFunction() |