Skip to content

Commit 4db1b14

Browse files
authored
Fix Redox CI (#85)
* Fix Redox CI * Bump libc version to fix Redox
1 parent 8197a18 commit 4db1b14

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.travis.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,13 @@ matrix:
9696

9797
- name: "cross-platform build only"
9898
rust: nightly
99-
# libc on Redox is broken: see https://github.com/rust-lang/libc/pull/1450
10099
install:
101100
- rustup target add x86_64-sun-solaris
102101
- rustup target add x86_64-unknown-cloudabi
103102
- rustup target add x86_64-unknown-freebsd
104103
- rustup target add x86_64-fuchsia
105104
- rustup target add x86_64-unknown-netbsd
106-
# - rustup target add x86_64-unknown-redox
105+
- rustup target add x86_64-unknown-redox
107106
- rustup target add x86_64-fortanix-unknown-sgx
108107
# For no_std targets
109108
- rustup component add rust-src
@@ -114,7 +113,7 @@ matrix:
114113
- cargo build --target=x86_64-unknown-freebsd
115114
- cargo build --target=x86_64-fuchsia
116115
- cargo build --target=x86_64-unknown-netbsd
117-
# - cargo build --target=x86_64-unknown-redox
116+
- cargo build --target=x86_64-unknown-redox
118117
- cargo build --target=x86_64-fortanix-unknown-sgx
119118
- cargo xbuild --target=x86_64-unknown-uefi
120119
- cargo xbuild --target=x86_64-unknown-hermit
@@ -126,7 +125,7 @@ matrix:
126125
- cargo build --target=x86_64-unknown-freebsd
127126
- cargo build --target=x86_64-fuchsia
128127
- cargo build --target=x86_64-unknown-netbsd
129-
# - cargo build --target=x86_64-unknown-redox
128+
- cargo build --target=x86_64-unknown-redox
130129
- cargo build --target=x86_64-fortanix-unknown-sgx
131130
- cargo xbuild --target=x86_64-unknown-uefi
132131
- 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"))'.dependencies]
29-
libc = { version = "0.2.60", default-features = false }
29+
libc = { version = "0.2.62", default-features = false }
3030

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

0 commit comments

Comments
 (0)