File tree 3 files changed +46
-2
lines changed
3 files changed +46
-2
lines changed Original file line number Diff line number Diff line change @@ -19,12 +19,22 @@ jobs:
19
19
i686-unknown-linux-gnu,
20
20
x86_64-unknown-linux-gnu,
21
21
]
22
+ bits : [
23
+ default,
24
+ 32,
25
+ 64
26
+ ]
27
+ exclude :
28
+ - target : x86_64-unknown-linux-gnu
29
+ bits : 32
30
+ - target : x86_64-unknown-linux-gnu
31
+ bits : 64
22
32
steps :
23
33
- uses : actions/checkout@v4
24
34
- name : Setup Rust toolchain
25
35
run : TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
26
36
- name : Execute run-docker.sh
27
- run : LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
37
+ run : LIBC_CI=1 RUST_LIBC_TIME_BITS=${{ matrix.bits }} sh ./ci/run-docker.sh ${{ matrix.target }}
28
38
29
39
macos :
30
40
permissions :
@@ -133,12 +143,22 @@ jobs:
133
143
# aren't defined on redox actually.
134
144
# x86_64-unknown-redox,
135
145
]
146
+ include :
147
+ - bits : default
148
+ - bits : 32
149
+ target : arm-unknown-linux-gnueabihf
150
+ - bits : 64
151
+ target : arm-unknown-linux-gnueabihf
152
+ - bits : 32
153
+ target : powerpc-unknown-linux-gnu
154
+ - bits : 64
155
+ target : powerpc-unknown-linux-gnu
136
156
steps :
137
157
- uses : actions/checkout@v4
138
158
- name : Setup Rust toolchain
139
159
run : TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
140
160
- name : Execute run-docker.sh
141
- run : LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
161
+ run : LIBC_CI=1 RUST_LIBC_TIME_BITS=${{ matrix.bits }} sh ./ci/run-docker.sh ${{ matrix.target }}
142
162
143
163
build_channels_linux :
144
164
permissions :
Original file line number Diff line number Diff line change @@ -23,6 +23,29 @@ test_target() {
23
23
TARGET=" ${2} "
24
24
NO_STD=" ${3} "
25
25
26
+ if [ " $RUST_LIBC_TIME_BITS " = " " ]; then
27
+ while true ; do
28
+ case " $TARGET " in
29
+ arm-unknown-linux-gnueabi);;
30
+ arm-unknown-linux-gnueabihf);;
31
+ armv7-unknown-linux-gnueabihf);;
32
+ i586-unknown-linux-gnu);;
33
+ i686-unknown-linux-gnu);;
34
+ powerpc-unknown-linux-gnu);;
35
+ armv5te-unknown-linux-gnueabi);;
36
+ mips-unknown-linux-gnu);;
37
+ mipsel-unknown-linux-gnu);;
38
+ powerpc-unknown-linux-gnuspe);;
39
+ riscv32gc-unknown-linux-gnu);;
40
+ sparc-unknown-linux-gnu);;
41
+ * ) break ;
42
+ esac
43
+ RUST_LIBC_TIME_BITS=32 test_target " $BUILD_CMD " " $TARGET " " $NO_STD "
44
+ RUST_LIBC_TIME_BITS=64 test_target " $BUILD_CMD " " $TARGET " " $NO_STD "
45
+ break # also build without RUST_LIBC_TIME_BITS set
46
+ done
47
+ fi
48
+
26
49
# If there is a std component, fetch it:
27
50
if [ " ${NO_STD} " != " 1" ]; then
28
51
# FIXME: rustup often fails to download some artifacts due to network
Original file line number Diff line number Diff line change @@ -43,6 +43,7 @@ run() {
43
43
--env LIBC_CI_ZBUILD_STD \
44
44
--env CARGO_HOME=/cargo \
45
45
--env CARGO_TARGET_DIR=/checkout/target \
46
+ --env RUST_LIBC_TIME_BITS \
46
47
--volume " $CARGO_HOME " :/cargo \
47
48
--volume " $( rustc --print sysroot) " :/rust:ro \
48
49
--volume " $( pwd) " :/checkout:ro \
You can’t perform that action at this time.
0 commit comments