Skip to content

Commit 039b3fd

Browse files
mcbartonvgvassilev
authored andcommitted
Fix Windows Emscripten build instructions
1 parent e5d06de commit 039b3fd

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
```
@@ -113,9 +113,9 @@ cd build
113113
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
114114
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten `
115115
-DLLVM_ENABLE_ASSERTIONS=ON `
116-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
116+
-DLLVM_TARGETS_TO_BUILD="WebAssembly" `
117117
-DLLVM_ENABLE_LIBEDIT=OFF `
118-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" `
118+
-DLLVM_ENABLE_PROJECTS="clang;lld" `
119119
-DLLVM_ENABLE_ZSTD=OFF `
120120
-DLLVM_ENABLE_LIBXML2=OFF `
121121
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `
@@ -192,13 +192,12 @@ emmake make -j $(nproc --all) check-cppinterop
192192
To build and test your Emscripten build of CppInterOp on Windows execute the following
193193

194194
```powershell
195-
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
195+
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
196196
-DCMAKE_PREFIX_PATH="$env:PREFIX" `
197197
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
198198
-DLLD_DIR="$env:LLVM_BUILD_DIR\lib\cmake\lld" `
199199
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" `
200200
-DBUILD_SHARED_LIBS=ON `
201-
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} `
202201
-DCMAKE_INSTALL_PREFIX="$env:PREFIX" `
203202
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON `
204203
-DLLVM_ENABLE_WERROR=On `

docs/Emscripten-build-instructions.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ On Windows execute the following
8181
.. code:: powershell
8282
8383
cd .\llvm-project\
84-
cp -r ..\patches\llvm\emscripten-clang${{ matrix.clang-runtime }}*
85-
cp -r ..\patches\llvm\Windows-emscripten-clang${{ matrix.clang-runtime }}*
84+
cp -r ..\patches\llvm\emscripten-clang20*
85+
cp -r ..\patches\llvm\Windows-emscripten-clang20*
8686
git apply -v Windows-emscripten-clang20-1-CrossCompile.patch
8787
git apply -v emscripten-clang20-2-shift-temporary-files-to-tmp-dir.patch
8888
@@ -133,9 +133,9 @@ or executing
133133
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
134134
-DLLVM_HOST_TRIPLE=wasm32-unknown-emscripten `
135135
-DLLVM_ENABLE_ASSERTIONS=ON `
136-
-DLLVM_TARGETS_TO_BUILD="${{ matrix.llvm_targets_to_build }}" `
136+
-DLLVM_TARGETS_TO_BUILD="WebAssembly" `
137137
-DLLVM_ENABLE_LIBEDIT=OFF `
138-
-DLLVM_ENABLE_PROJECTS="${{ matrix.llvm_enable_projects }}" `
138+
-DLLVM_ENABLE_PROJECTS="clang;lld" `
139139
-DLLVM_ENABLE_ZSTD=OFF `
140140
-DLLVM_ENABLE_LIBXML2=OFF `
141141
-DCLANG_ENABLE_STATIC_ANALYZER=OFF `
@@ -217,13 +217,12 @@ To build and test your Emscripten build of CppInterOp on Windows execute the fol
217217

218218
.. code:: powershell
219219
220-
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
220+
emcmake cmake -DCMAKE_BUILD_TYPE=Release `
221221
-DCMAKE_PREFIX_PATH="$env:PREFIX" `
222222
-DLLVM_DIR="$env:LLVM_BUILD_DIR\lib\cmake\llvm" `
223223
-DLLD_DIR="$env:LLVM_BUILD_DIR\lib\cmake\lld" `
224224
-DClang_DIR="$env:LLVM_BUILD_DIR\lib\cmake\clang" `
225225
-DBUILD_SHARED_LIBS=ON `
226-
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} `
227226
-DCMAKE_INSTALL_PREFIX="$env:PREFIX" `
228227
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON `
229228
-DLLVM_ENABLE_WERROR=On `

0 commit comments

Comments
 (0)