Skip to content
Snippets Groups Projects
Commit 9dac9076 authored by John Hodge's avatar John Hodge
Browse files

Remove "sysroot" crates from dependency lists

parent 3659ee40
No related merge requests found
...@@ -103,9 +103,7 @@ $(OBJDIR)loader/bin/src/main.o: $(LOADER_DEPS) ...@@ -103,9 +103,7 @@ $(OBJDIR)loader/bin/src/main.o: $(LOADER_DEPS)
.PHONY: xargo .PHONY: xargo
xargo: $(OBJDIR)rustrt0.o $(LIBDIR)libloader_dyn.so $(LIBDIR)libloader_start.a # Referenced by link-$(TARGET).ld xargo: $(OBJDIR)rustrt0.o $(LIBDIR)libloader_dyn.so $(LIBDIR)libloader_start.a # Referenced by link-$(TARGET).ld
#$(XARGO) build $(XARGO_FLAGS) --manifest-path libstd/Cargo.toml
$(XARGO) build $(XARGO_FLAGS) --manifest-path loader/bin/Cargo.toml $(XARGO) build $(XARGO_FLAGS) --manifest-path loader/bin/Cargo.toml
#cp target/$(XARGO_TARGET)/$(XARGO_PROFILE)/libstd.rlib ../.prefix/xargo/lib/rustlib/$(XARGO_TARGET)/lib/
$(XARGO) build $(XARGO_FLAGS) $(XARGO) build $(XARGO_FLAGS)
$(LIBDIR)libloader_start.a: $(OBJDIR)loader/bin/start.ao $(LIBDIR)libloader_start.a: $(OBJDIR)loader/bin/start.ao
......
...@@ -3,8 +3,8 @@ name = "filebrowser" ...@@ -3,8 +3,8 @@ name = "filebrowser"
version = "0.0.1" version = "0.0.1"
[dependencies] [dependencies]
#std = { path = "../libstd" }
wtk = { path = "../libwtk" } wtk = { path = "../libwtk" }
vec_ring = { path = "../libvec_ring" } vec_ring = { path = "../libvec_ring" }
syscalls = { path = "../libsyscalls" }
loader = { path = "../loader/lib" } #syscalls = { path = "../libsyscalls" }
#loader = { path = "../loader/lib" }
...@@ -7,4 +7,4 @@ path = "lib.rs" ...@@ -7,4 +7,4 @@ path = "lib.rs"
[dependencies] [dependencies]
#std = { path = "../libstd" } #std = { path = "../libstd" }
syscalls = { path = "../libsyscalls" } #syscalls = { path = "../libsyscalls" }
...@@ -9,3 +9,5 @@ std_sync = { path = "../libstd_sync" } ...@@ -9,3 +9,5 @@ std_sync = { path = "../libstd_sync" }
syscalls = { path = "../libsyscalls" } syscalls = { path = "../libsyscalls" }
macros = { path = "../libmacros" } macros = { path = "../libmacros" }
alloc_system = { path = "../liballoc_system" } alloc_system = { path = "../liballoc_system" }
loader = { path = "../loader/lib" }
...@@ -6,9 +6,9 @@ version = "0.0.1" ...@@ -6,9 +6,9 @@ version = "0.0.1"
path = "lib.rs" path = "lib.rs"
[dependencies] [dependencies]
syscalls = { path = "../libsyscalls" }
macros = { path = "../libmacros" } macros = { path = "../libmacros" }
async = { path = "../libasync" } async = { path = "../libasync" }
byteorder = { path = "../libbyteorder" } byteorder = { path = "../libbyteorder" }
#std = { path = "../libstd" } #std = { path = "../libstd" }
#syscalls = { path = "../libsyscalls" }
...@@ -6,10 +6,10 @@ version = "0.0.0" ...@@ -6,10 +6,10 @@ version = "0.0.0"
#path = "src/main.rs" #path = "src/main.rs"
[dependencies] [dependencies]
loader = { path = "../lib" }
byteorder = { path = "../../libbyteorder" } byteorder = { path = "../../libbyteorder" }
macros = { path = "../../libmacros" } macros = { path = "../../libmacros" }
cmdline_words_parser = { path = "../../../externals/crates.io/cmdline_words_parser" } cmdline_words_parser = { path = "../../../externals/crates.io/cmdline_words_parser" }
# Part of sysroot # Part of sysroot
#syscalls = { path = "../../libsyscalls" } #syscalls = { path = "../../libsyscalls" }
#loader = { path = "../lib" }
...@@ -7,6 +7,7 @@ path = "lib.rs" ...@@ -7,6 +7,7 @@ path = "lib.rs"
[dependencies] [dependencies]
syscalls = { path = "../../libsyscalls" } syscalls = { path = "../../libsyscalls" }
#byteorder = { path = "../libbyteorder" } #byteorder = { path = "../libbyteorder" }
#macros = { path = "../libmacros" } #macros = { path = "../libmacros" }
#cmdline_words_parser = { path = "../../externals/crates.io/cmdline_words_parser" } #cmdline_words_parser = { path = "../../externals/crates.io/cmdline_words_parser" }
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