Skip to content

Commit 0ae0a22

Browse files
committed
Update Makefile to remove libprotobuf patches
It's a followup for the previous changes that updated emsdk version and refreshed the build scripts. Testing confirms that patches for the protobuf library sources are not necessary anymore, so I'm updating this Makefile to remove the patching logic that was already removed from all other places. Signed-off-by: Mikhail Krinkin <[email protected]>
1 parent 8dc2641 commit 0ae0a22

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ proxy_wasm_intrinsics_lite.pb.h struct_lite.pb.h: proxy_wasm_intrinsics_lite.pro
1212
protoc --cpp_out=. struct_lite.proto
1313

1414
${CPP_API}/libprotobuf.a ${CPP_API}/libprotobuf-lite.a:
15-
rm -rf protobuf-wasm && git clone https://github.com/protocolbuffers/protobuf protobuf-wasm \
16-
&& cd protobuf-wasm && git checkout v3.9.1 \
17-
&& rm -rf wasm-patches && git clone https://github.com/kwonoj/protobuf-wasm wasm-patches \
18-
&& cd wasm-patches && git checkout 4bba8b2f38b5004f87489642b6ca4525ae72fe7f \
19-
&& cd .. && git apply wasm-patches/*.patch \
15+
rm -rf protobuf-wasm \
16+
&& git clone https://github.com/protocolbuffers/protobuf protobuf-wasm \
17+
&& cd protobuf-wasm \
18+
&& git checkout v3.9.1 \
2019
&& ./autogen.sh \
2120
&& emconfigure ./configure --disable-shared CXXFLAGS="-O3 -flto" \
2221
&& emmake make \

0 commit comments

Comments
 (0)