Skip to content

Commit 169fc5c

Browse files
authored
Make use of EMSDK environment variable which comes from sourcing emsdk script
1 parent 4ee2748 commit 169fc5c

File tree

5 files changed

+5
-15
lines changed

5 files changed

+5
-15
lines changed

.github/workflows/deploy-github-page.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,15 @@ jobs:
5050
mkdir build
5151
pushd build
5252
53-
export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
5453
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
5554
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
56-
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
5755
5856
emcmake cmake \
5957
-DCMAKE_BUILD_TYPE=Release \
6058
-DCMAKE_INSTALL_PREFIX=$PREFIX \
6159
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
6260
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
63-
-DSYSROOT_PATH=$SYSROOT_PATH \
61+
-DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \
6462
..
6563
emmake make -j ${{ env.ncpus }} install
6664

.github/workflows/main.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,17 +233,15 @@ jobs:
233233
mkdir build
234234
pushd build
235235
236-
export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
237236
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
238237
echo "PREFIX=$PREFIX" >> $GITHUB_ENV
239-
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
240238
241239
emcmake cmake \
242240
-DCMAKE_BUILD_TYPE=Release \
243241
-DCMAKE_INSTALL_PREFIX=$PREFIX \
244242
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
245243
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
246-
-DSYSROOT_PATH=$SYSROOT_PATH \
244+
-DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \
247245
..
248246
emmake make -j ${{ env.ncpus }} install
249247

CONTRIBUTING.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,14 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin
8080
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
8181
mkdir build
8282
cd build
83-
export BUILD_TOOLS_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
8483
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
85-
export SYSROOT_PATH=$BUILD_TOOLS_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
8684

8785
emcmake cmake \
8886
-DCMAKE_BUILD_TYPE=Release \
8987
-DCMAKE_INSTALL_PREFIX=$PREFIX \
9088
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
9189
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
92-
-DSYSROOT_PATH=$SYSROOT_PATH \
90+
-DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \
9391
..
9492
emmake make install
9593
```

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,14 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin
8181
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
8282
mkdir build
8383
cd build
84-
export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
8584
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
86-
export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
8785

8886
emcmake cmake \
8987
-DCMAKE_BUILD_TYPE=Release \
9088
-DCMAKE_INSTALL_PREFIX=$PREFIX \
9189
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
9290
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
93-
-DSYSROOT_PATH=$SYSROOT_PATH \
91+
-DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \
9492
..
9593
emmake make install
9694
```

docs/source/InstallationAndUsage.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,13 @@ You are now in a position to build the xeus-cpp kernel. You build it by executin
6969
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
7070
mkdir build
7171
cd build
72-
export BUILD_TOOLS_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build
7372
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host
74-
export SYSROOT_PATH=$BUILD_TOOLS_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot
7573
emcmake cmake \
7674
-DCMAKE_BUILD_TYPE=Release \
7775
-DCMAKE_INSTALL_PREFIX=$PREFIX \
7876
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
7977
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
80-
-DSYSROOT_PATH=$SYSROOT_PATH \
78+
-DSYSROOT_PATH=$EMSDK/upstream/emscripten/cache/sysroot \
8179
..
8280
emmake make install
8381

0 commit comments

Comments
 (0)