From 1fc85c83e862a922ebfcbb6fbe153b44faf15ec4 Mon Sep 17 00:00:00 2001 From: Andrii Rublov Date: Fri, 13 Sep 2024 12:42:30 -0700 Subject: [PATCH 1/4] Add missing architecture URL part to the installation script --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3b506ff1a..2c5dc8eae 100644 --- a/README.md +++ b/README.md @@ -132,10 +132,11 @@ see [RELEASING.md](RELEASING.md). A typical installation from the release binaries might look like the following: ```shell script -export WASI_VERSION=20 +export WASI_ARCH=x86_64 +export WASI_VERSION=24 export WASI_VERSION_FULL=${WASI_VERSION}.0 -wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz -tar xvf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz +wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz +tar xvf wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz ``` ## Use @@ -143,7 +144,7 @@ tar xvf wasi-sdk-${WASI_VERSION_FULL}-linux.tar.gz Use the clang installed in the `wasi-sdk` directory: ```shell script -export WASI_SDK_PATH=`pwd`/wasi-sdk-${WASI_VERSION_FULL} +export WASI_SDK_PATH=`pwd`/wasi-sdk-${WASI_VERSION_FULL}-{WASI_ARCH}-linux CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot" $CC foo.c -o foo.wasm ``` From 868ea56b282165ca009019d13268bc1fd42cad1e Mon Sep 17 00:00:00 2001 From: Andrii Rublov Date: Tue, 17 Sep 2024 10:37:18 -0700 Subject: [PATCH 2/4] Remove unnecessary `export`s from installation instructions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2c5dc8eae..9134a0c7b 100644 --- a/README.md +++ b/README.md @@ -132,9 +132,9 @@ see [RELEASING.md](RELEASING.md). A typical installation from the release binaries might look like the following: ```shell script -export WASI_ARCH=x86_64 -export WASI_VERSION=24 -export WASI_VERSION_FULL=${WASI_VERSION}.0 +WASI_ARCH=x86_64 +WASI_VERSION=24 +WASI_VERSION_FULL=${WASI_VERSION}.0 wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz tar xvf wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz ``` From 23d1194d3ac77198b3df2ff230fd2f5fc468ffca Mon Sep 17 00:00:00 2001 From: Andrii Rublov Date: Wed, 18 Sep 2024 08:19:50 -0700 Subject: [PATCH 3/4] Fix missing $ sign in export Co-authored-by: Andrew Brown --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9134a0c7b..334643aa4 100644 --- a/README.md +++ b/README.md @@ -144,7 +144,7 @@ tar xvf wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz Use the clang installed in the `wasi-sdk` directory: ```shell script -export WASI_SDK_PATH=`pwd`/wasi-sdk-${WASI_VERSION_FULL}-{WASI_ARCH}-linux +export WASI_SDK_PATH=`pwd`/wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot" $CC foo.c -o foo.wasm ``` From ab0b8fc8168dbfd8a93e8c3141a2d5d42f5c2140 Mon Sep 17 00:00:00 2001 From: Andrii Rublov Date: Wed, 18 Sep 2024 08:22:18 -0700 Subject: [PATCH 4/4] Add `WASI_OS` as new parameter to use & install scripts in README --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 334643aa4..22138e5b6 100644 --- a/README.md +++ b/README.md @@ -132,11 +132,12 @@ see [RELEASING.md](RELEASING.md). A typical installation from the release binaries might look like the following: ```shell script +WASI_OS=linux WASI_ARCH=x86_64 WASI_VERSION=24 WASI_VERSION_FULL=${WASI_VERSION}.0 -wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz -tar xvf wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz +wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_VERSION}/wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-${WASI_OS}.tar.gz +tar xvf wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-${WASI_OS}.tar.gz ``` ## Use @@ -144,7 +145,7 @@ tar xvf wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux.tar.gz Use the clang installed in the `wasi-sdk` directory: ```shell script -export WASI_SDK_PATH=`pwd`/wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-linux +WASI_SDK_PATH=`pwd`/wasi-sdk-${WASI_VERSION_FULL}-${WASI_ARCH}-${WASI_OS} CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot" $CC foo.c -o foo.wasm ```