?

Author: JohnTitor

ci/docker/wasm32-wasi/Dockerfile

@@ -27,7 +27,7 @@ COPY docker/wasm32-wasi/clang.sh /wasi-libc/bin/clang
 
 RUN apt-get install -y --no-install-recommends lld
 RUN ln -s /usr/bin/wasm-ld-10 /usr/bin/wasm-ld
-ENV PATH=$PATH:/usr/lib/llvm-9/bin
+ENV PATH=$PATH:/usr/lib/llvm-10/bin
 
 # Of note here is our clang wrapper which just executes a normal clang
 # executable with the right sysroot, and then we're sure to turn off the
@@ -37,4 +37,4 @@ ENV CARGO_TARGET_WASM32_WASI_RUNNER=wasmtime \
   CARGO_TARGET_WASM32_WASI_LINKER=/wasi-libc/bin/clang \
   CC_wasm32_wasi=/wasi-libc/bin/clang \
   PATH=$PATH:/rust/bin \
-  RUSTFLAGS='-Ctarget-feature=-crt-static -Clink-args=-Wl,-v'
+  RUSTFLAGS=-Ctarget-feature=-crt-static

ci/install-rust.sh

@@ -7,9 +7,12 @@ echo "Setup toolchain"
 toolchain=
 if [ -n "$TOOLCHAIN" ]; then
   toolchain=$TOOLCHAIN
+elif [ "$TARGET" = "wasm32-wasi" ]; then
+  toolchain=1.45.2
 else
   toolchain=nightly
 fi
+
 if [ "$OS" = "windows" ]; then
   : "${TARGET?The TARGET environment variable must be set.}"
   rustup set profile minimal

libc-test/Cargo.toml

@@ -18,7 +18,7 @@ default-features = false
 [build-dependencies]
 cc = "1.0.61"
 # FIXME: Use fork ctest until the maintainer gets back.
-ctest2 = "0.4"
+ctest2 = "=0.4.0"
 
 [features]
 default = [ "std" ]

libc-test/build.rs

@@ -71,6 +71,10 @@ fn do_semver() {
     out.push("semver.rs");
     let mut output = BufWriter::new(File::create(&out).unwrap());
 
+    if env::var("TARGET").unwrap().contains("wasi") {
+        return;
+    }
+
     let family = env::var("CARGO_CFG_TARGET_FAMILY").unwrap();
     let vendor = env::var("CARGO_CFG_TARGET_VENDOR").unwrap();
     let os = env::var("CARGO_CFG_TARGET_OS").unwrap();

libc-test/test/semver.rs

@@ -3,9 +3,6 @@
 
 extern crate libc;
 
-// Generated in `build.rs`.
-include!(concat!(env!("OUT_DIR"), "/semver.rs"));
-
 fn main() {
     // The test is about the imports created in `semver.rs`.
     println!("PASSED 1 tests");