From 9dac907617532f0388f01396bc3a9cfec18d8c28 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sat, 6 Apr 2019 10:12:27 +0800
Subject: [PATCH] Remove "sysroot" crates from dependency lists
---
Usermode/Makefile | 2 --
Usermode/filebrowser/Cargo.toml | 6 +++---
Usermode/libasync/Cargo.toml | 2 +-
Usermode/libstd/Cargo.toml | 2 ++
Usermode/libwtk/Cargo.toml | 2 +-
Usermode/loader/bin/Cargo.toml | 2 +-
Usermode/loader/lib/Cargo.toml | 1 +
7 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Usermode/Makefile b/Usermode/Makefile
index ed494fd2..9c32b324 100644
--- a/Usermode/Makefile
+++ b/Usermode/Makefile
@@ -103,9 +103,7 @@ $(OBJDIR)loader/bin/src/main.o: $(LOADER_DEPS)
.PHONY: xargo
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
- #cp target/$(XARGO_TARGET)/$(XARGO_PROFILE)/libstd.rlib ../.prefix/xargo/lib/rustlib/$(XARGO_TARGET)/lib/
$(XARGO) build $(XARGO_FLAGS)
$(LIBDIR)libloader_start.a: $(OBJDIR)loader/bin/start.ao
diff --git a/Usermode/filebrowser/Cargo.toml b/Usermode/filebrowser/Cargo.toml
index abc74a0e..3564d4cb 100644
--- a/Usermode/filebrowser/Cargo.toml
+++ b/Usermode/filebrowser/Cargo.toml
@@ -3,8 +3,8 @@ name = "filebrowser"
version = "0.0.1"
[dependencies]
-#std = { path = "../libstd" }
wtk = { path = "../libwtk" }
vec_ring = { path = "../libvec_ring" }
-syscalls = { path = "../libsyscalls" }
-loader = { path = "../loader/lib" }
+
+#syscalls = { path = "../libsyscalls" }
+#loader = { path = "../loader/lib" }
diff --git a/Usermode/libasync/Cargo.toml b/Usermode/libasync/Cargo.toml
index 25984cf8..a9cce034 100644
--- a/Usermode/libasync/Cargo.toml
+++ b/Usermode/libasync/Cargo.toml
@@ -7,4 +7,4 @@ path = "lib.rs"
[dependencies]
#std = { path = "../libstd" }
-syscalls = { path = "../libsyscalls" }
+#syscalls = { path = "../libsyscalls" }
diff --git a/Usermode/libstd/Cargo.toml b/Usermode/libstd/Cargo.toml
index b23003ff..f139856e 100644
--- a/Usermode/libstd/Cargo.toml
+++ b/Usermode/libstd/Cargo.toml
@@ -9,3 +9,5 @@ std_sync = { path = "../libstd_sync" }
syscalls = { path = "../libsyscalls" }
macros = { path = "../libmacros" }
alloc_system = { path = "../liballoc_system" }
+
+loader = { path = "../loader/lib" }
diff --git a/Usermode/libwtk/Cargo.toml b/Usermode/libwtk/Cargo.toml
index a6bc0700..1d12d85d 100644
--- a/Usermode/libwtk/Cargo.toml
+++ b/Usermode/libwtk/Cargo.toml
@@ -6,9 +6,9 @@ version = "0.0.1"
path = "lib.rs"
[dependencies]
-syscalls = { path = "../libsyscalls" }
macros = { path = "../libmacros" }
async = { path = "../libasync" }
byteorder = { path = "../libbyteorder" }
#std = { path = "../libstd" }
+#syscalls = { path = "../libsyscalls" }
diff --git a/Usermode/loader/bin/Cargo.toml b/Usermode/loader/bin/Cargo.toml
index 3f5df146..793e5dce 100644
--- a/Usermode/loader/bin/Cargo.toml
+++ b/Usermode/loader/bin/Cargo.toml
@@ -6,10 +6,10 @@ version = "0.0.0"
#path = "src/main.rs"
[dependencies]
-loader = { path = "../lib" }
byteorder = { path = "../../libbyteorder" }
macros = { path = "../../libmacros" }
cmdline_words_parser = { path = "../../../externals/crates.io/cmdline_words_parser" }
# Part of sysroot
#syscalls = { path = "../../libsyscalls" }
+#loader = { path = "../lib" }
diff --git a/Usermode/loader/lib/Cargo.toml b/Usermode/loader/lib/Cargo.toml
index d0f1730b..46a5bb8d 100644
--- a/Usermode/loader/lib/Cargo.toml
+++ b/Usermode/loader/lib/Cargo.toml
@@ -7,6 +7,7 @@ path = "lib.rs"
[dependencies]
syscalls = { path = "../../libsyscalls" }
+
#byteorder = { path = "../libbyteorder" }
#macros = { path = "../libmacros" }
#cmdline_words_parser = { path = "../../externals/crates.io/cmdline_words_parser" }
--
GitLab