Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
John Hodge
rust_os
Commits
9dac9076
Commit
9dac9076
authored
Apr 06, 2019
by
John Hodge
Browse files
Remove "sysroot" crates from dependency lists
parent
3659ee40
Changes
7
Hide whitespace changes
Inline
Side-by-side
Usermode/Makefile
View file @
9dac9076
...
...
@@ -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
...
...
Usermode/filebrowser/Cargo.toml
View file @
9dac9076
...
...
@@ -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" }
Usermode/libasync/Cargo.toml
View file @
9dac9076
...
...
@@ -7,4 +7,4 @@ path = "lib.rs"
[dependencies]
#std = { path = "../libstd" }
syscalls
=
{
path
=
"../libsyscalls"
}
#
syscalls = { path = "../libsyscalls" }
Usermode/libstd/Cargo.toml
View file @
9dac9076
...
...
@@ -9,3 +9,5 @@ std_sync = { path = "../libstd_sync" }
syscalls
=
{
path
=
"../libsyscalls"
}
macros
=
{
path
=
"../libmacros"
}
alloc_system
=
{
path
=
"../liballoc_system"
}
loader
=
{
path
=
"../loader/lib"
}
Usermode/libwtk/Cargo.toml
View file @
9dac9076
...
...
@@ -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" }
Usermode/loader/bin/Cargo.toml
View file @
9dac9076
...
...
@@ -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" }
Usermode/loader/lib/Cargo.toml
View file @
9dac9076
...
...
@@ -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" }
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment