From 0401378ab2f7a68761b7f6b7557eee4a6473aba4 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Thu, 24 Jul 2025 13:48:28 +0100 Subject: [PATCH 1/2] Fix XEUS_CPP_RESOURCE_DIR Emscripten-build-instructions.md --- Emscripten-build-instructions.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Emscripten-build-instructions.md b/Emscripten-build-instructions.md index 497205553..2c74e102c 100644 --- a/Emscripten-build-instructions.md +++ b/Emscripten-build-instructions.md @@ -319,12 +319,13 @@ emmake make -j $(nproc --all) install ## Xeus-cpp-lite Wasm Build Instructions A project which makes use of the wasm build of CppInterOp is xeus-cpp. xeus-cpp is a C++ Jupyter kernel. Assuming you are in -the CppInterOp build folder, you can build the wasm version of xeus-cpp by executing (replace $LLVM_VERSION with the version +the CppInterOp build folder, you can build the wasm version of xeus-cpp by executing (replace LLVM_VERSION with the version of llvm you are building against) ```bash cd ../.. git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git +export LLVM_VERSION=20 cd ./xeus-cpp mkdir build cd build @@ -334,7 +335,7 @@ emcmake cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ - -DXEUS_CPP_RESOURCE_DIR=$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION \ + -DXEUS_CPP_RESOURCE_DIR="$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION" \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make -j $(nproc --all) install From e9d119281e3192bd0ef579e6fe2c57b5e4bc08b2 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Thu, 24 Jul 2025 13:49:28 +0100 Subject: [PATCH 2/2] Fix XEUS_CPP_RESOURCE_DIR Emscripten-build-instructions.rst --- docs/Emscripten-build-instructions.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/Emscripten-build-instructions.rst b/docs/Emscripten-build-instructions.rst index 82af5fc7e..259dd89c7 100644 --- a/docs/Emscripten-build-instructions.rst +++ b/docs/Emscripten-build-instructions.rst @@ -341,12 +341,13 @@ Assuming it passes all test you can install by executing the following. A project which makes use of the wasm build of CppInterOp is xeus-cpp. xeus-cpp is a C++ Jupyter kernel. Assuming you are in the CppInterOp build folder, you can build the wasm version of xeus-cpp by executing -(replace $LLVM_VERSION with the version of llvm you are building against) +(replace LLVM_VERSION with the version of llvm you are building against) .. code:: bash cd ../.. git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git + export LLVM_VERSION=20 cd ./xeus-cpp mkdir build cd build @@ -356,7 +357,7 @@ build folder, you can build the wasm version of xeus-cpp by executing -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \ - -DXEUS_CPP_RESOURCE_DIR=$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION \ + -DXEUS_CPP_RESOURCE_DIR="$LLVM_BUILD_DIR/lib/clang/$LLVM_VERSION" \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. emmake make -j $(nproc --all) install