Skip to content

Commit bbbf6d0

Browse files
authored
Apply some PR comments
1 parent c6fb53f commit bbbf6d0

File tree

5 files changed

+13
-33
lines changed

5 files changed

+13
-33
lines changed

.github/workflows/emscripten.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ jobs:
355355
}
356356
elseif ( "${{ matrix.clang-runtime }}" -imatch "21" )
357357
{
358-
git apply -v Windows-emscripten-clang21-1-CrossCompile.patch
359-
git apply -v emscripten-clang21-2-shift-temporary-files-to-tmp-dir.patch
358+
git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch
359+
git apply -v emscripten-clang21-2-enable_exception_handling.patch
360360
}
361361
cd build
362362
echo "Apply clang${{ matrix.clang-runtime }}-*.patch patches:"

Emscripten-build-instructions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ $env:PWD_DIR= $PWD.Path
4242
$env:SYSROOT_PATH="$env:EMSDK/upstream/emscripten/cache/sysroot"
4343
```
4444

45-
Now clone the 20.x release of the LLVM project repository and CppInterOp (the building of the emscripten version of llvm can be
45+
Now clone the 21.x release of the LLVM project repository and CppInterOp (the building of the emscripten version of llvm can be
4646
avoided by executing micromamba install llvm -c <https://repo.mamba.pm/emscripten-forge> and setting the LLVM_BUILD_DIR/$env:LLVM_BUILD_DIR appropriately)
4747

4848
```bash
49-
git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
49+
git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git
5050
git clone --depth=1 https://github.com/compiler-research/CppInterOp.git
5151
```
5252

@@ -55,16 +55,16 @@ executing
5555

5656
```bash
5757
cd ./llvm-project/
58-
git apply -v ../CppInterOp/patches/llvm/emscripten-clang20-*.patch
58+
git apply -v ../CppInterOp/patches/llvm/emscripten-clang21-*.patch
5959
```
6060

6161
On Windows execute the following
6262

6363
```powershell
6464
cd .\llvm-project\
65-
cp -r ..\patches\llvm\emscripten-clang20*
66-
git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
67-
git apply -v emscripten-clang20-3-enable_exception_handling.patch
65+
cp -r ..\patches\llvm\emscripten-clang21*
66+
git apply -v emscripten-clang21-1-shift-temporary-files-to-tmp-dir.patch
67+
git apply -v emscripten-clang21-2-enable_exception_handling.patch
6868
```
6969

7070
We are now in a position to build an emscripten build of llvm by executing the following on Linux
@@ -343,7 +343,7 @@ of llvm you are building against)
343343
```bash
344344
cd ../..
345345
git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
346-
export LLVM_VERSION=20
346+
export LLVM_VERSION=21
347347
cd ./xeus-cpp
348348
mkdir build
349349
cd build

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ git clone --depth=1 https://github.com/compiler-research/cppyy-backend.git
104104

105105
#### Setup Clang-REPL
106106

107-
Clone the 20.x release of the LLVM project repository.
107+
Clone the 1.x release of the LLVM project repository.
108108

109109
```bash
110-
git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
110+
git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git
111111
cd llvm-project
112112
```
113113

@@ -406,10 +406,10 @@ git clone --depth=1 https://github.com/compiler-research/cppyy-backend.git
406406

407407
#### Setup Clang-REPL
408408

409-
Clone the 20.x release of the LLVM project repository.
409+
Clone the 21.x release of the LLVM project repository.
410410

411411
```bash
412-
git clone --depth=1 --branch release/20.x https://github.com/llvm/llvm-project.git
412+
git clone --depth=1 --branch release/21.x https://github.com/llvm/llvm-project.git
413413
cd llvm-project
414414
```
415415

patches/llvm/Windows-emscripten-clang21-1-CrossCompile.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)