From 711735ac807c20e232c0553f0d2710aee643f3eb Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Sun, 12 Mar 2023 14:07:02 +0900
Subject: [PATCH] Do not use prefixed clang for wasi

Rust 1.68 (https://github.com/rust-lang/rust/pull/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'
```
---
 .github/workflows/ci.yml | 12 +-----------
 docker/wasi.Dockerfile   |  7 ++++---
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9fef01b..e890c95 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,17 +50,7 @@ jobs:
           - target: illumos
           - target: redox
           # - target: fuchsia
-          # TODO(wasi):
-          # = 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'
-          # - target: wasi
+          - target: wasi
           - target: emscripten
           - target: windows-gnu
           - target: windows-gnu
diff --git a/docker/wasi.Dockerfile b/docker/wasi.Dockerfile
index a91b9cc..3aa090c 100644
--- a/docker/wasi.Dockerfile
+++ b/docker/wasi.Dockerfile
@@ -33,9 +33,10 @@ COPY --from=wasi-sdk /wasi-sdk "${TOOLCHAIN_DIR}"
 RUN --mount=type=bind,target=/docker \
     /docker/base/common.sh
 
-RUN --mount=type=bind,target=/docker \
-    COMMON_FLAGS="-L\"\${toolchain_dir}\"/lib -L\"\${toolchain_dir}\"/${RUST_TARGET}/lib/${RUST_TARGET}" \
-    /docker/clang-cross.sh
+# Do not use prefixed clang: https://github.com/taiki-e/setup-cross-toolchain-action/commit/fd352f3ffabd00daf2759ab4a3276729e52eeb10
+# RUN --mount=type=bind,target=/docker \
+#     COMMON_FLAGS="-L\"\${toolchain_dir}\"/lib -L\"\${toolchain_dir}\"/${RUST_TARGET}/lib/${RUST_TARGET}" \
+#     /docker/clang-cross.sh
 
 FROM ghcr.io/taiki-e/build-base:ubuntu-"${UBUNTU_VERSION}" as test-base
 SHELL ["/bin/bash", "-euxo", "pipefail", "-c"]