Skip to content

Commit 6f6ac18

Browse files
committed
ci: Enable build for cygwin, m68k, no-std hexagon
1 parent 349b0c3 commit 6f6ac18

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

tools/build.sh

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,8 @@ build() {
309309
xtensa*) return 0 ;;
310310
# rustc-LLVM ERROR: Cannot select: 0x7f9dc3256d20: ..., src/num/mod.rs:713:25
311311
amdgcn*) return 0 ;;
312-
# assembly error in compiler_builtins
313-
*-cygwin*) return 0 ;;
314312
# error: symbol 'fma' is already defined
315-
hexagon*) return 0 ;;
313+
hexagon-unknown-linux-musl) return 0 ;;
316314
esac
317315
args+=(-Z build-std="core")
318316
elif is_no_std "${target}"; then
@@ -368,6 +366,10 @@ build() {
368366
# "error: target requires explicitly specifying a cpu with `-C target-cpu`"
369367
target_rustflags+=" -C target-cpu=gfx600"
370368
;;
369+
m68k*)
370+
# Workaround for compiler SIGSEGV.
371+
target_rustflags+=" -C opt-level=s"
372+
;;
371373
mips-*-linux-* | mipsel-*-linux-*)
372374
if ! grep -Eq "^${target}$" <<<"${rustup_target_list}"; then
373375
# TODO: LLVM bug: Undefined temporary symbol error when building std.
@@ -448,12 +450,6 @@ build() {
448450
--workspace --exclude bench
449451
)
450452
elif [[ -n "${TARGET_GROUP:-}" ]]; then
451-
case "${target}" in
452-
# TODO(m68k): LLVM bug: https://github.com/rust-lang/rust/issues/89498
453-
m68k*) return 0 ;;
454-
# TODO: "error: symbol 'f{ma,max}' is already defined" due to https://github.com/rust-lang/compiler-builtins/pull/577
455-
hexagon-unknown-none-elf) return 0 ;;
456-
esac
457453
RUSTFLAGS="${target_rustflags}" \
458454
x_cargo "${args[@]}" --manifest-path Cargo.toml "$@"
459455
return 0

0 commit comments

Comments
 (0)