mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc changes

Browse Source
This commit is contained in:
bjorn3 2019-08-11 17:33:52 +02:00
parent 9041db962d
commit 05b7312db2
2 changed files with 5 additions and 10 deletions

4
config.sh

@ -16,5 +16,5 @@ export RUSTFLAGS='-Zalways-encode-mir -Cpanic=abort -Cdebuginfo=2 -Zcodegen-back
RUSTC="rustc $RUSTFLAGS -L crate=target/out --out-dir target/out"
export RUSTC_LOG=warn # display metadata load errors
export LD_LIBRARY_PATH=$(pwd)/target/out
export DYLD_LIBRARY_PATH=$(pwd)/target/out
export LD_LIBRARY_PATH="$(pwd)/target/out:$(pwd)/build_sysroot/sysroot/lib/rustlib/$TARGET_TRIPLE/lib"
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH

11
src/driver.rs

@ -18,13 +18,6 @@ pub fn codegen_crate(
metadata: EncodedMetadata,
need_metadata_module: bool,
) -> Box<dyn Any> {
if !tcx.sess.crate_types.get().contains(&CrateType::Executable)
&& std::env::var("SHOULD_RUN").is_ok()
{
tcx.sess
.err("Can't JIT run non executable (SHOULD_RUN env var is set)");
}
tcx.sess.abort_if_errors();
let mut log = if cfg!(debug_assertions) {
@ -33,7 +26,9 @@ pub fn codegen_crate(
None
};
if std::env::var("SHOULD_RUN").is_ok() {
if std::env::var("SHOULD_RUN").is_ok()
&& tcx.sess.crate_types.get().contains(&CrateType::Executable)
{
#[cfg(not(target_arch = "wasm32"))]
let _: ! = run_jit(tcx, &mut log);