From 56160d433658bfb02ada5d88e25047c3b276b02d Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Tue, 13 Aug 2019 12:16:51 -0700 Subject: [PATCH 1/2] Fix Redox CI --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index fef185eb..19e566c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,14 +96,13 @@ matrix: - name: "cross-platform build only" rust: nightly - # libc on Redox is broken: see https://github.com/rust-lang/libc/pull/1450 install: - rustup target add x86_64-sun-solaris - rustup target add x86_64-unknown-cloudabi - rustup target add x86_64-unknown-freebsd - rustup target add x86_64-fuchsia - rustup target add x86_64-unknown-netbsd - # - rustup target add x86_64-unknown-redox + - rustup target add x86_64-unknown-redox - rustup target add x86_64-fortanix-unknown-sgx # For no_std targets - rustup component add rust-src @@ -114,7 +113,7 @@ matrix: - cargo build --target=x86_64-unknown-freebsd - cargo build --target=x86_64-fuchsia - cargo build --target=x86_64-unknown-netbsd - # - cargo build --target=x86_64-unknown-redox + - cargo build --target=x86_64-unknown-redox - cargo build --target=x86_64-fortanix-unknown-sgx - cargo xbuild --target=x86_64-unknown-uefi - cargo xbuild --target=x86_64-unknown-hermit @@ -126,7 +125,7 @@ matrix: - cargo build --target=x86_64-unknown-freebsd - cargo build --target=x86_64-fuchsia - cargo build --target=x86_64-unknown-netbsd - # - cargo build --target=x86_64-unknown-redox + - cargo build --target=x86_64-unknown-redox - cargo build --target=x86_64-fortanix-unknown-sgx - cargo xbuild --target=x86_64-unknown-uefi - cargo xbuild --target=x86_64-unknown-hermit From 4c52e9da8dbad709363d569c32b4f6e09a4b5bac Mon Sep 17 00:00:00 2001 From: Joe Richey Date: Sat, 24 Aug 2019 19:09:07 -0700 Subject: [PATCH 2/2] Bump libc version to fix Redox --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 2fb7604d..b191ebec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ compiler_builtins = { version = "0.1", optional = true } core = { version = "1.0", optional = true, package = "rustc-std-workspace-core" } [target.'cfg(any(unix, target_os = "redox"))'.dependencies] -libc = { version = "0.2.60", default-features = false } +libc = { version = "0.2.62", default-features = false } [target.'cfg(target_os = "wasi")'.dependencies] wasi = "0.5"