Commit 9f9c5732 authored by Isaac Oscar Gariano's avatar Isaac Oscar Gariano

Fixed CI script to set LD_LIBRARY_PATH

parent 4264c8ec
......@@ -9,6 +9,7 @@ before_script:
- export ZEBU_BUILD=release
- export CARGO_HOME=.cargo
- export CC=clang
- export LD_LIBRARY_PATH=$MU_ZEBU/target/$ZEBU_BUILD:$LD_LIBRARY_PATH
- source /home/gitlab-runner/ci/bin/activate
build:
......
......@@ -156,11 +156,15 @@ fn link_executable_internal(
cc.arg(format!("-l{}", l));
}
cc.arg(format!("-L{}", get_path_under_zebu(if cfg!(debug_assertions) {
"target/debug"
} else {
"target/release"
}).to_str().unwrap()));
cc.arg(format!(
"-L{}",
get_path_under_zebu(if cfg!(debug_assertions) {
"target/debug"
} else {
"target/release"
}).to_str()
.unwrap()
));
// dylibs used for linux
if cfg!(target_os = "linux") {
......
......@@ -135,15 +135,11 @@ unsafe impl rodal::Dump for VM {
dumper.dump_object(&self.next_id);
dumper.dump_padding(&self.id_name_map);
let id_name_map = RwLock::new(
rodal::EmptyHashMap::<MuID, MuName>::new()
);
let id_name_map = RwLock::new(rodal::EmptyHashMap::<MuID, MuName>::new());
dumper.dump_object_here(&id_name_map);
dumper.dump_padding(&self.name_id_map);
let name_id_map = RwLock::new(
rodal::EmptyHashMap::<MuName, MuID>::new()
);
let name_id_map = RwLock::new(rodal::EmptyHashMap::<MuName, MuID>::new());
dumper.dump_object_here(&name_id_map);
dumper.dump_object(&self.name_id_map);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment