Remove wasm32-wasi and wasm32-wasi-threads targets

These are now named `wasm32-wasip1` and `wasm32-wasip1-threads`. The
previous targets take time to build in CI and space in the distribution,
and clang is warning about their usage. Remove them now that the warning
has been around for a bit.

Author: alexcrichton

CMakeLists.txt

@@ -11,7 +11,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 project(wasi-sdk)
 include(ExternalProject)
 
-set(WASI_SDK_TARGETS "wasm32-wasi;wasm32-wasip1;wasm32-wasip2;wasm32-wasip1-threads;wasm32-wasi-threads"
+set(WASI_SDK_TARGETS "wasm32-wasip1;wasm32-wasip2;wasm32-wasip1-threads"
   CACHE STRING "List of WASI targets to build")
 option(WASI_SDK_BUILD_TOOLCHAIN "Build a toolchain instead of the sysroot" OFF)
 

README.md

@@ -74,7 +74,7 @@ is to build the sysroot:
 ```shell script
 cmake -G Ninja -B build/sysroot -S . \
     -DCMAKE_INSTALL_PREFIX=build/install \
-    -DCMAKE_TOOLCHAIN_FILE=build/install/share/cmake/wasi-sdk.cmake \
+    -DCMAKE_TOOLCHAIN_FILE=build/install/share/cmake/wasi-sdk-p2.cmake \
     -DCMAKE_C_COMPILER_WORKS=ON \
     -DCMAKE_CXX_COMPILER_WORKS=ON
 cmake --build build/sysroot --target install

ci/build.sh

@@ -33,7 +33,7 @@ fi
 # Use the just-built toolchain and its `CMAKE_TOOLCHAIN_FILE` to build a
 # sysroot.
 cmake -G Ninja -B $build_dir/sysroot -S . \
-  "-DCMAKE_TOOLCHAIN_FILE=$build_dir/install/share/cmake/wasi-sdk.cmake" \
+  "-DCMAKE_TOOLCHAIN_FILE=$build_dir/install/share/cmake/wasi-sdk-p1.cmake" \
   -DCMAKE_C_COMPILER_WORKS=ON \
   -DCMAKE_CXX_COMPILER_WORKS=ON \
   -DWASI_SDK_INCLUDE_TESTS=ON \

cmake/wasi-sdk-toolchain.cmake

@@ -298,7 +298,6 @@ endfunction()
 
 copy_misc_file(src/config/config.sub misc)
 copy_misc_file(src/config/config.guess misc)
-copy_misc_file(wasi-sdk.cmake cmake)
 copy_misc_file(wasi-sdk-pthread.cmake cmake)
 copy_misc_file(wasi-sdk-p1.cmake cmake)
 copy_misc_file(wasi-sdk-p2.cmake cmake)