8000 [3.11] gh-95174: Move WASIX logic into wasi-env (GH-95320) by miss-islington · Pull Request #95331 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.11] gh-95174: Move WASIX logic into wasi-env (GH-95320) #95331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2022
Merged

[3.11] gh-95174: Move WASIX logic into wasi-env (GH-95320) #95331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Tools/wasm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,15 +234,14 @@ compatibility stubs.

The script ``wasi-env`` sets necessary compiler and linker flags as well as
``pkg-config`` overrides. The script assumes that WASI-SDK is installed in
``/opt/wasi-sdk`` or ``$WASI_SDK_PATH``.
``/opt/wasi-sdk`` or ``$WASI_SDK_PATH`` and WASIX is installed in
``/opt/wasix`` or ``$WASIX_PATH``.

```shell
mkdir -p builddir/wasi
pushd builddir/wasi

CONFIG_SITE=../../Tools/wasm/config.site-wasm32-wasi \
CFLAGS="-isystem /opt/wasix/include" \
LDFLAGS="-L/opt/wasix/lib -lwasix" \
../../Tools/wasm/wasi-env ../../configure -C \
--host=wasm32-unknown-wasi \
--build=$(../../config.guess) \
Expand Down
26 changes: 20 additions & 6 deletions Tools/wasm/wasi-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,24 @@ if test -z "$1"; then
fi

WASI_SDK_PATH="${WASI_SDK_PATH:-/opt/wasi-sdk}"
WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
WASIX_PATH="${WASIX_PATH:-/opt/wasix}"

if ! test -x "${WASI_SDK_PATH}/bin/clang"; then
echo "Error: ${WASI_SDK_PATH}/bin/clang does not exist." >&2
exit 2
fi

CC="${WASI_SDK_PATH}/bin/clang"
CPP="${WASI_SDK_PATH}/bin/clang-cpp"
CXX="${WASI_SDK_PATH}/bin/clang++"

# --sysroot is required if WASI-SDK is not installed in /opt/wasi-sdk.
WASI_SYSROOT="${WASI_SDK_PATH}/share/wasi-sysroot"
CC="${WASI_SDK_PATH}/bin/clang --sysroot=${WASI_SYSROOT}"
CPP="${WASI_SDK_PATH}/bin/clang-cpp --sysroot=${WASI_SYSROOT}"
CXX="${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SYSROOT}"
if test "${WASI_SDK_PATH}" != "/opt/wasi-sdk"; then
CC="${CC} --sysroot=${WASI_SYSROOT}"
CPP="${CPP} --sysroot=${WASI_SYSROOT}"
CXX="${CXX} --sysroot=${WASI_SYSROOT}"
fi

# use ccache if available
if command -v ccache >/dev/null 2>&1; then
Expand All @@ -58,10 +65,17 @@ PKG_CONFIG_PATH=""
PKG_CONFIG_LIBDIR="${WASI_SYSROOT}/lib/pkgconfig:${WASI_SYSROOT}/share/pkgconfig"
PKG_CONFIG_SYSROOT_DIR="${WASI_SYSROOT}"

PATH="${WASI_SDK_PATH}/bin:$PATH"
# add WASIX (POSIX stubs for WASI) if WASIX is installed
if test -f "${WASIX_PATH}/lib/libwasix.a"; then
CFLAGS="${CFLAGS} -isystem ${WASIX_PATH}/include"
LDFLAGS="${LDFLAGS} -L${WASIX_PATH}/lib -lwasix"
fi

PATH="${WASI_SDK_PATH}/bin:${PATH}"

export WASI_SDK_PATH
export WASI_SDK_PATH WASI_SYSROOT
export CC CPP CXX LDSHARED AR RANLIB
export CFLAGS LDFLAGS
export PKG_CONFIG_PATH PKG_CONFIG_LIBDIR PKG_CONFIG_SYSROOT_DIR
export PATH

Expand Down
0