Skip to content

Commit 711735a

Browse files
committed
Do not use prefixed clang for wasi
Rust 1.68 (rust-lang/rust#106489) broke this: ``` = note: clang-15: error: unsupported option '--export' clang-15: error: unsupported option '--stack-first' clang-15: error: unsupported option '--allow-undefined' clang-15: error: unsupported option '--fatal-warnings' clang-15: error: unsupported option '--no-demangle' clang-15: error: unsupported option '--gc-sections' clang-15: error: unknown argument: '-flavor' clang-15: error: no such file or directory: 'wasm' clang-15: error: no such file or directory: '__main_void' ```
1 parent 22db560 commit 711735a

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,7 @@ jobs:
5050
- target: illumos
5151
- target: redox
5252
# - target: fuchsia
53-
# TODO(wasi):
54-
# = note: clang-15: error: unsupported option '--export'
55-
# clang-15: error: unsupported option '--stack-first'
56-
# clang-15: error: unsupported option '--allow-undefined'
57-
# clang-15: error: unsupported option '--fatal-warnings'
58-
# clang-15: error: unsupported option '--no-demangle'
59-
# clang-15: error: unsupported option '--gc-sections'
60-
# clang-15: error: unknown argument: '-flavor'
61-
# clang-15: error: no such file or directory: 'wasm'
62-
# clang-15: error: no such file or directory: '__main_void'
63-
# - target: wasi
53+
- target: wasi
6454
- target: emscripten
6555
- target: windows-gnu
6656
- target: windows-gnu

docker/wasi.Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ COPY --from=wasi-sdk /wasi-sdk "${TOOLCHAIN_DIR}"
3333
RUN --mount=type=bind,target=/docker \
3434
/docker/base/common.sh
3535

36-
RUN --mount=type=bind,target=/docker \
37-
COMMON_FLAGS="-L\"\${toolchain_dir}\"/lib -L\"\${toolchain_dir}\"/${RUST_TARGET}/lib/${RUST_TARGET}" \
38-
/docker/clang-cross.sh
36+
# Do not use prefixed clang: https://github.com/taiki-e/setup-cross-toolchain-action/commit/fd352f3ffabd00daf2759ab4a3276729e52eeb10
37+
# RUN --mount=type=bind,target=/docker \
38+
# COMMON_FLAGS="-L\"\${toolchain_dir}\"/lib -L\"\${toolchain_dir}\"/${RUST_TARGET}/lib/${RUST_TARGET}" \
39+
# /docker/clang-cross.sh
3940

4041
FROM ghcr.io/taiki-e/build-base:ubuntu-"${UBUNTU_VERSION}" as test-base
4142
SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]

0 commit comments

Comments
 (0)