aboutsummaryrefslogtreecommitdiff
path: root/COMPILING.md
diff options
context:
space:
mode:
authorKun Zhang <zhangkun83@users.noreply.github.com>2018-01-05 16:40:20 -0800
committerGitHub <noreply@github.com>2018-01-05 16:40:20 -0800
commit86d64122e5fa440827028db735a0cba938f8464f (patch)
treecd9f76ad60c49b1153012d0bc14f7d11d6f71736 /COMPILING.md
parent5aed25210588b621bb040ce64a138a54d68dd08a (diff)
downloadgrpc-grpc-java-86d64122e5fa440827028db735a0cba938f8464f.tar.gz
Upgrade to Protobuf 3.5.1 and Protoc 3.5.1-1. (#3921)
protoc-3.5.0-linux-x86_64 introduced GLIBC_2.14 dependency and broke gRPC release process (https://github.com/google/protobuf/issues/4138). 3.5.1-1 is the proper re-build.
Diffstat (limited to 'COMPILING.md')
-rw-r--r--COMPILING.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/COMPILING.md b/COMPILING.md
index 6b3c642fb..0e4b5e668 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -33,7 +33,7 @@ For Linux, Mac and MinGW:
```
$ git clone https://github.com/google/protobuf.git
$ cd protobuf
-$ git checkout v3.5.0
+$ git checkout v3.5.1
$ ./autogen.sh
$ ./configure
$ make
@@ -72,16 +72,16 @@ When building on Windows and VC++, you need to specify project properties for
Gradle to find protobuf:
```
.\gradlew install ^
- -PvcProtobufInclude=C:\path\to\protobuf-3.5.0\src ^
- -PvcProtobufLibs=C:\path\to\protobuf-3.5.0\vsprojects\Release ^
+ -PvcProtobufInclude=C:\path\to\protobuf-3.5.1\src ^
+ -PvcProtobufLibs=C:\path\to\protobuf-3.5.1\vsprojects\Release ^
-PtargetArch=x86_32
```
Since specifying those properties every build is bothersome, you can instead
create ``<project-root>\gradle.properties`` with contents like:
```
-vcProtobufInclude=C:\\path\\to\\protobuf-3.5.0\\src
-vcProtobufLibs=C:\\path\\to\\protobuf-3.5.0\\vsprojects\\Release
+vcProtobufInclude=C:\\path\\to\\protobuf-3.5.1\\src
+vcProtobufLibs=C:\\path\\to\\protobuf-3.5.1\\vsprojects\\Release
targetArch=x86_32
```