Skip to content

Commit 0a5ba4a

Browse files
committed
Fix Redox CI
We will use xbuild until rust-lang/rust#63160 is fixed
1 parent f94b44a commit 0a5ba4a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ matrix:
102102

103103
- rust: nightly
104104
env: DESCRIPTION="cross-platform build only"
105-
# libc on Redox is broken: see https://github.com/rust-lang/libc/pull/1450
106105
install:
107106
- rustup target add x86_64-sun-solaris
108107
- rustup target add x86_64-unknown-cloudabi
109108
- rustup target add x86_64-unknown-freebsd
110109
- rustup target add x86_64-fuchsia
111110
- rustup target add x86_64-unknown-netbsd
111+
# https://github.com/rust-lang/rust/issues/63160
112112
# - rustup target add x86_64-unknown-redox
113113
- rustup target add x86_64-fortanix-unknown-sgx
114114
# For no_std targets
@@ -120,7 +120,7 @@ matrix:
120120
- cargo build --target=x86_64-unknown-freebsd
121121
- cargo build --target=x86_64-fuchsia
122122
- cargo build --target=x86_64-unknown-netbsd
123-
# - cargo build --target=x86_64-unknown-redox
123+
- cargo xbuild --target=x86_64-unknown-redox
124124
- cargo build --target=x86_64-fortanix-unknown-sgx
125125
- cargo xbuild --target=x86_64-unknown-uefi
126126
- cargo xbuild --target=x86_64-unknown-hermit
@@ -132,7 +132,7 @@ matrix:
132132
- cargo build --target=x86_64-unknown-freebsd
133133
- cargo build --target=x86_64-fuchsia
134134
- cargo build --target=x86_64-unknown-netbsd
135-
# - cargo build --target=x86_64-unknown-redox
135+
- cargo xbuild --target=x86_64-unknown-redox
136136
- cargo build --target=x86_64-fortanix-unknown-sgx
137137
- cargo xbuild --target=x86_64-unknown-uefi
138138
- cargo xbuild --target=x86_64-unknown-hermit

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ compiler_builtins = { version = "0.1", optional = true }
2626
core = { version = "1.0", optional = true, package = "rustc-std-workspace-core" }
2727

2828
[target.'cfg(any(unix, target_os = "redox", target_os = "wasi"))'.dependencies]
29-
libc = { version = "0.2.60", default-features = false }
29+
libc = { version = "0.2.61", default-features = false }
3030

3131
[target.'cfg(target_os = "wasi")'.dependencies]
3232
wasi = "0.5"

0 commit comments

Comments
 (0)