Remove `wasm32-wasi` and `wasm32-wasi-threads` targets (#637)

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.

.github/workflows/main.yml

@@ -292,6 +292,6 @@ jobs:
           cmake -G Ninja -B build -S . \
             -DWASI_SDK_INCLUDE_TESTS=ON \
             -DWASI_SDK_TEST_HOST_TOOLCHAIN=ON \
-            -DCMAKE_TOOLCHAIN_FILE=$(ls ./wasi-sdk-*/share/cmake/wasi-sdk.cmake)
+            -DCMAKE_TOOLCHAIN_FILE=$(ls ./wasi-sdk-*/share/cmake/wasi-sdk-p1.cmake)
       - run: ninja -C build build-tests
       - run: ctest --output-on-failure --parallel 10 --test-dir build/tests

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)

wasi-sdk.cmake

@@ -1,38 +0,0 @@
-# Cmake toolchain description file for the Makefile
-
-# Until Platform/WASI.cmake is upstream we need to inject the path to it
-# into CMAKE_MODULE_PATH.
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
-
-set(CMAKE_SYSTEM_NAME WASI)
-set(CMAKE_SYSTEM_VERSION 1)
-set(CMAKE_SYSTEM_PROCESSOR wasm32)
-set(CMAKE_EXECUTABLE_SUFFIX .wasm)
-set(triple wasm32-wasi)
-
-if(WIN32)
-	set(WASI_HOST_EXE_SUFFIX ".exe")
-else()
-	set(WASI_HOST_EXE_SUFFIX "")
-endif()
-
-# When building from source, WASI_SDK_PREFIX represents the generated directory
-if(NOT WASI_SDK_PREFIX)
-	set(WASI_SDK_PREFIX ${CMAKE_CURRENT_LIST_DIR}/../../)
-endif()
-
-set(CMAKE_C_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_CXX_COMPILER ${WASI_SDK_PREFIX}/bin/clang++${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_ASM_COMPILER ${WASI_SDK_PREFIX}/bin/clang${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_AR ${WASI_SDK_PREFIX}/bin/llvm-ar${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_RANLIB ${WASI_SDK_PREFIX}/bin/llvm-ranlib${WASI_HOST_EXE_SUFFIX})
-set(CMAKE_C_COMPILER_TARGET ${triple})
-set(CMAKE_CXX_COMPILER_TARGET ${triple})
-set(CMAKE_ASM_COMPILER_TARGET ${triple})
-
-# Don't look in the sysroot for executables to run during the build
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# Only look in the sysroot (not in the host paths) for the rest
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)