From 59349a7d5c7df3fd703065aa3a32fdfe2b477548 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 3 Nov 2016 17:41:10 -0600 Subject: [PATCH] Update libc --- libstd_real/Cargo.toml | 2 +- libstd_real/alloc_system/Cargo.toml | 3 ++- programs/orbutils | 2 +- programs/pkgutils | 2 +- programs/userutils | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libstd_real/Cargo.toml b/libstd_real/Cargo.toml index 7b766cd..5658c28 100644 --- a/libstd_real/Cargo.toml +++ b/libstd_real/Cargo.toml @@ -15,4 +15,4 @@ libc = { path = "libc" } unwind = { path = "unwind" } [replace] -"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "new_kernel" } +"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "redox" } diff --git a/libstd_real/alloc_system/Cargo.toml b/libstd_real/alloc_system/Cargo.toml index 2b00dcb..96036f5 100644 --- a/libstd_real/alloc_system/Cargo.toml +++ b/libstd_real/alloc_system/Cargo.toml @@ -4,7 +4,8 @@ version = "0.0.0" authors = ["Jeremy Soller "] [dependencies.ralloc] -path = "../../ralloc/" +git = "https://github.com/redox-os/ralloc.git" +branch = "new_kernel" default-features = false features = ["allocator"] diff --git a/programs/orbutils b/programs/orbutils index b7ba513..c281770 160000 --- a/programs/orbutils +++ b/programs/orbutils @@ -1 +1 @@ -Subproject commit b7ba51384d8d5ecf66d10c0e73e6bd3375e43913 +Subproject commit c281770b27c54486fea6e20c784d10c55f38561a diff --git a/programs/pkgutils b/programs/pkgutils index 62d860f..ce419fc 160000 --- a/programs/pkgutils +++ b/programs/pkgutils @@ -1 +1 @@ -Subproject commit 62d860f9a226c0be54bf4969ed1afae42f445f19 +Subproject commit ce419fcdcec4d049462ab465464bd1651822f7a4 diff --git a/programs/userutils b/programs/userutils index 98d7b64..8a7f4bb 160000 --- a/programs/userutils +++ b/programs/userutils @@ -1 +1 @@ -Subproject commit 98d7b64a16c9c5e617c5e206945a9f380788111b +Subproject commit 8a7f4bba830a82473588d9b41f8725a3105ac614