Fixed some more version conflicts

parent e8a7c0d3
Pipeline #3496 failed with stages
in 1 minute and 32 seconds
...@@ -31,13 +31,13 @@ sel4-rumprun-target-side = [] ...@@ -31,13 +31,13 @@ sel4-rumprun-target-side = []
[build-dependencies] [build-dependencies]
gcc = "*" gcc = "*"
#built = "0.1" built = "*"
[dependencies] [dependencies]
mu_ast = {path = "src/ast"} mu_ast = {path = "src/ast"}
mu_utils = {path = "src/utils"} mu_utils = {path = "src/utils"}
#mu_gc = {path = "src/gc"} #mu_gc = {path = "src/gc"}
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "rust-1.30.1", version = "^0.3.18" }
#rodal = { path = "./rodal", version = "*" } #rodal = { path = "./rodal", version = "*" }
libc="*" libc="*"
...@@ -58,28 +58,29 @@ docopt = "0.8.1" ...@@ -58,28 +58,29 @@ docopt = "0.8.1"
petgraph = "*" petgraph = "*"
extprim = "*" extprim = "*"
num-traits = "*" num-traits = "*"
#built = "0.1" built = "*"
[target.aarch64-unknown-linux-gnu.dependencies]
mu_gc = { path = "src/gc"}
built = "0.1"
[target.x86_64-unknown-linux-gnu.dependencies]
mu_gc = { path = "src/gc"}
built = "0.1"
[target.x86_64-apple-darwin.dependencies]
mu_gc = { path = "src/gc"} mu_gc = { path = "src/gc"}
built = "0.1"
[target.x86_64-rumprun-netbsd.dependencies] #[target.aarch64-unknown-linux-gnu.dependencies]
mu_gc = { path = "src/gc", features = ["sel4-rumprun-target-side"], target = "x86_64-rumprun-netbsd"} #mu_gc = { path = "src/gc"}
#built = "0.1"
[target.aarch64-unknown-linux-gnu.build-dependencies] #
built = "0.1" #[target.x86_64-unknown-linux-gnu.dependencies]
#mu_gc = { path = "src/gc"}
[target.x86_64-unknown-linux-gnu.build-dependencies] #built = "*"
built = "0.1" #
#[target.x86_64-apple-darwin.dependencies]
[target.x86_64-apple-darwin.build-dependencies] #mu_gc = { path = "src/gc"}
built = "0.1" #built = "0.1"
#
#[target.x86_64-rumprun-netbsd.dependencies]
#mu_gc = { path = "src/gc", features = ["sel4-rumprun-target-side"], target = "x86_64-rumprun-netbsd"}
#
#[target.aarch64-unknown-linux-gnu.build-dependencies]
#built = "0.1"
#
#[target.x86_64-unknown-linux-gnu.build-dependencies]
#built = "*"
#
#[target.x86_64-apple-darwin.build-dependencies]
#built = "0.1"
...@@ -26,5 +26,5 @@ lazy_static = "0.2.11" ...@@ -26,5 +26,5 @@ lazy_static = "0.2.11"
log = "*" log = "*"
simple_logger = "*" simple_logger = "*"
regex = "0.2.2" regex = "0.2.2"
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "rust-1.30.1", version = "^0.3.18" }
#rodal = { path = "../../rodal", version = "*" } #rodal = { path = "../../rodal", version = "*" }
...@@ -38,5 +38,5 @@ stderrlog = "*" ...@@ -38,5 +38,5 @@ stderrlog = "*"
aligned_alloc = "*" aligned_alloc = "*"
crossbeam = "0.3.0" crossbeam = "0.3.0"
field-offset = "*" field-offset = "*"
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "rust-1.30.1", version = "^0.3.18" }
#rodal = { path = "../../rodal", version = "*" } #rodal = { path = "../../rodal", version = "*" }
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
extern void* vm; extern void* vm;
extern void* RODAL_END; extern void* RODAL_END;
extern void mu_main(void*, void*, int, char**); extern void mu_main(void*, void*, int, char**);
extern void rodal_init_deallocate(void);
extern void rodal_free(void*);
extern void* rodal_realloc(void*, size_t);
extern uint32_t mu_retval; extern uint32_t mu_retval;
...@@ -36,10 +33,7 @@ int main(int argc, char** argv) { ...@@ -36,10 +33,7 @@ int main(int argc, char** argv) {
STRUCT_TAG_MAP_LOC = &STRUCT_TAG_MAP; STRUCT_TAG_MAP_LOC = &STRUCT_TAG_MAP;
HYBRID_TAG_MAP_LOC = &HYBRID_TAG_MAP; HYBRID_TAG_MAP_LOC = &HYBRID_TAG_MAP;
rodal_init_deallocate();
mu_main(&RODAL_END, &vm, argc, argv); mu_main(&RODAL_END, &vm, argc, argv);
return (int)mu_retval; return (int)mu_retval;
} }
void free(void* ptr) { return rodal_free(ptr); };
void* realloc(void* ptr, size_t s) { return rodal_realloc(ptr, s); };
\ No newline at end of file
...@@ -27,5 +27,5 @@ memsec = "0.1.9" ...@@ -27,5 +27,5 @@ memsec = "0.1.9"
byteorder = "*" byteorder = "*"
log = "*" log = "*"
doubly = "1.1.3" doubly = "1.1.3"
rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "new", version = "^0.1.13" } rodal = { git = "https://gitlab.anu.edu.au/mu/rodal", branch = "rust-1.30.1", version = "^0.3.18" }
#rodal = { path = "../../rodal", version = "*" } #rodal = { path = "../../rodal", version = "*" }
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