From 64118c158b84033d9957919644bd57acac90ecaa Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 28 Nov 2016 18:14:21 -0700 Subject: [PATCH] Update to make libstd use redox_syscall --- kernel/scheme/debug.rs | 1 - libstd/Cargo.toml | 4 ++++ rust | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/scheme/debug.rs b/kernel/scheme/debug.rs index 3845670..4d929a8 100644 --- a/kernel/scheme/debug.rs +++ b/kernel/scheme/debug.rs @@ -5,7 +5,6 @@ use spin::Once; use context; use scheme::*; use sync::WaitQueue; -use syscall::error::*; use syscall::flag::EVENT_READ; use syscall::scheme::Scheme; diff --git a/libstd/Cargo.toml b/libstd/Cargo.toml index 471f2b4..38264dc 100644 --- a/libstd/Cargo.toml +++ b/libstd/Cargo.toml @@ -17,3 +17,7 @@ unwind = { path = "unwind" } [replace] "libc:0.2.17" = { git = "https://github.com/rust-lang/libc.git" } + +[target.'cfg(target_os = "redox")'.dependencies] +redox_syscall = { git = "https://github.com/redox-os/syscall.git" } + diff --git a/rust b/rust index d73d32f..746222f 160000 --- a/rust +++ b/rust @@ -1 +1 @@ -Subproject commit d73d32f58d477ca1562e3fc0e966efc88e81409e +Subproject commit 746222fd9d6c16d3dc3c44c797dcc868297c133b