From 169fc5c8cc265d3b3aa0f06704f171d362a1b42e Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 18 Mar 2025 21:09:27 +0000 Subject: [PATCH] Make use of EMSDK environment variable which comes from sourcing emsdk script --- .github/workflows/deploy-github-page.yml | 4 +--- .github/workflows/main.yml | 4 +--- CONTRIBUTING.md | 4 +--- README.md | 4 +--- docs/source/InstallationAndUsage.rst | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index 64c26e2d..29030410 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -50,17 +50,15 @@ jobs: mkdir build pushd build - export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host echo "PREFIX=$PREFIX" >> $GITHUB_ENV - export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ - -DSYSROOT_PATH=$SYSROOT_PATH \ + -DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \ .. emmake make -j ${{ env.ncpus }} install diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b032f0c..b09c2aa6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -233,17 +233,15 @@ jobs: mkdir build pushd build - export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host echo "PREFIX=$PREFIX" >> $GITHUB_ENV - export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ - -DSYSROOT_PATH=$SYSROOT_PATH \ + -DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \ .. emmake make -j ${{ env.ncpus }} install diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9a9e4c39..285bfa2d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -80,16 +80,14 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32 mkdir build cd build -export BUILD_TOOLS_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host -export SYSROOT_PATH=$BUILD_TOOLS_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ - -DSYSROOT_PATH=$SYSROOT_PATH \ + -DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \ .. emmake make install ``` diff --git a/README.md b/README.md index 61880552..b06b747a 100644 --- a/README.md +++ b/README.md @@ -81,16 +81,14 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32 mkdir build cd build -export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host -export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ - -DSYSROOT_PATH=$SYSROOT_PATH \ + -DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \ .. emmake make install ``` diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index eb892b8b..fe3304eb 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -69,15 +69,13 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32 mkdir build cd build - export BUILD_TOOLS_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host - export SYSROOT_PATH=$BUILD_TOOLS_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ - -DSYSROOT_PATH=$SYSROOT_PATH \ + -DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \ .. emmake make install