Skip to content

Commit 8de900b

Browse files
committed
Fix Windows Emscripten build instructions
1 parent 2595a1f commit 8de900b

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

Emscripten-build-instructions.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ On Windows execute the following
6262

6363
```powershell
6464
cd .\llvm-project\
65-
cp -r ..\patches\llvm\emscripten-clang${{ matrix.clang-runtime }}*
66-
cp -r ..\patches\llvm\Windows-emscripten-clang${{ matrix.clang-runtime }}*
65+
cp -r ..\patches\llvm\emscripten-clang20*
66+
cp -r ..\patches\llvm\Windows-emscripten-clang20*
6767
git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
6868
git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
6969
```
@@ -106,9 +106,9 @@ cd build
106106
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
107107
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten `
108108
-DLLVM_ENABLE_ASSERTIONS=ON `
109-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
109+
-DLLVM_TARGETS_TO_BUILD="WebAssembly" `
110110
-DLLVM_ENABLE_LIBEDIT=OFF `
111-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" `
111+
-DLLVM_ENABLE_PROJECTS="clang;lld" `
112112
-DLLVM_ENABLE_ZSTD=OFF `
113113
-DLLVM_ENABLE_LIBXML2=OFF `
114114
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `
@@ -185,13 +185,12 @@ emmake make -j $(nproc --all) check-cppinterop
185185
To build and test your Emscripten build of CppInterOp on Windows execute the following
186186

187187
```powershell
188-
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
188+
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
189189
-DCMAKE_PREFIX_PATH="$env:PREFIX" `
190190
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
191191
-DLLD_DIR="$env:LLVM_BUILD_DIR\lib\cmake\lld" `
192192
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" `
193193
-DBUILD_SHARED_LIBS=ON `
194-
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} `
195194
-DCMAKE_INSTALL_PREFIX="$env:PREFIX" `
196195
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON `
197196
-DLLVM_ENABLE_WERROR=On `

docs/Emscripten-build-instructions.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ On Windows execute the following
7777
.. code:: powershell
7878
7979
cd .\llvm-project\
80-
cp -r ..\patches\llvm\emscripten-clang${{ matrix.clang-runtime }}*
81-
cp -r ..\patches\llvm\Windows-emscripten-clang${{ matrix.clang-runtime }}*
80+
cp -r ..\patches\llvm\emscripten-clang20*
81+
cp -r ..\patches\llvm\Windows-emscripten-clang20*
8282
git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
8383
git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
8484
@@ -122,9 +122,9 @@ or executing
122122
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
123123
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten `
124124
-DLLVM_ENABLE_ASSERTIONS=ON `
125-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
125+
-DLLVM_TARGETS_TO_BUILD="WebAssembly" `
126126
-DLLVM_ENABLE_LIBEDIT=OFF `
127-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" `
127+
-DLLVM_ENABLE_PROJECTS="clang;lld" `
128128
-DLLVM_ENABLE_ZSTD=OFF `
129129
-DLLVM_ENABLE_LIBXML2=OFF `
130130
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `
@@ -206,13 +206,12 @@ To build and test your Emscripten build of CppInterOp on Windows execute the fol
206206

207207
.. code:: powershell
208208
209-
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
209+
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
210210
-DCMAKE_PREFIX_PATH="$env:PREFIX" `
211211
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
212212
-DLLD_DIR="$env:LLVM_BUILD_DIR\lib\cmake\lld" `
213213
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" `
214214
-DBUILD_SHARED_LIBS=ON `
215-
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} `
216215
-DCMAKE_INSTALL_PREFIX="$env:PREFIX" `
217216
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON `
218217
-DLLVM_ENABLE_WERROR=On `

0 commit comments

Comments
 (0)