Skip to content

Commit 8dc2641

Browse files
committed
Update building.md to match updated sdk_container.sh
This is a followup to the previous commits that refreshed the build scripts and emsdk. This change reconciles the docs with the current state of the build scripts. Signed-off-by: Mikhail Krinkin <[email protected]>
1 parent 90d8c07 commit 8dc2641

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

Diff for: docs/building.md

+9-10
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,10 @@ sudo make install
163163
```bash
164164
git clone https://github.com/emscripten-core/emsdk.git
165165
cd emsdk
166-
./emsdk update-tags
167-
./emsdk install 3.1.7
168-
./emsdk activate 3.1.7
166+
git checkout 3.1.67
167+
168+
./emsdk install 3.1.67
169+
./emsdk activate 3.1.67
169170

170171
source ./emsdk_env.sh
171172
```
@@ -178,21 +179,19 @@ It is possible later versions will work, e.g.
178179
./emsdk activate latest
179180
```
180181

181-
However 3.1.7 is known to work.
182+
However 3.1.67 is known to work.
182183

183184
### Rebuilding the libprotobuf.a files
184185

185-
If want to rebuild the libprotobuf.a files using a version of protobuf prior to
186-
3.15, see the instructions at https://github.com/kwonoj/protobuf-wasm. Commit
187-
4bba8b2f38b5004f87489642b6ca4525ae72fe7f works for protobuf v3.9.x.
186+
To build the protobuf static libraries for use in your proxy-wasm wasm module,
187+
if you need them, you may use Emscripten in the same way sdk\_container.sh does
188+
it:
188189

189190
```bash
190191
git clone https://github.com/protocolbuffers/protobuf protobuf-wasm
191192
cd protobuf-wasm
192193
git checkout v3.9.1
193-
git clone https://github.com/kwonoj/protobuf-wasm wasm-patches
194-
cd wasm-patches && git checkout 4bba8b2f38b5004f87489642b6ca4525ae72fe7f && cd ..
195-
git apply wasm-patches/*.patch
194+
git submodule update --init --recursive
196195
./autogen.sh
197196
emconfigure ./configure --disable-shared CXXFLAGS="-O3 -flto"
198197
emmake make

0 commit comments

Comments
 (0)