From 3c872fd2ba4ce485b770996d9c7317dcf7badeea Mon Sep 17 00:00:00 2001 From: Robin Randhawa <robin.randhawa@arm.com> Date: Wed, 27 Feb 2019 15:27:44 +0000 Subject: [PATCH] Fix build breakage on aarch64 due to stale syscall refs References to the syscall crate's relibc branch broke builds of ion for aarch64. AArch64 syscalls were added at a later point in time to the master branch of the syscall crate. Fix things by changing the refs to use the master branch instead. --- Cargo.toml | 2 +- members/sys/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 95b7cd34..0b5c34cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,4 +66,4 @@ panic = "abort" [patch.crates-io] termion = { git = "https://gitlab.redox-os.org/redox-os/termion" } liner = { git = "https://gitlab.redox-os.org/redox-os/liner" } -redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git", branch = "relibc" } +redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git" } diff --git a/members/sys/Cargo.toml b/members/sys/Cargo.toml index b8ac096a..2b62e150 100644 --- a/members/sys/Cargo.toml +++ b/members/sys/Cargo.toml @@ -11,7 +11,7 @@ libc = "0.2" users = "0.8.1" [target."cfg(target_os = \"redox\")".dependencies] -redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git", branch = "relibc" } +redox_syscall = { git = "https://gitlab.redox-os.org/redox-os/syscall.git" } [target."cfg(target_os = \"dragonfly\")".dependencies] -- GitLab