diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-08-18 16:19:45 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-08-18 16:19:45 -0700 |
| commit | fdb5cd5e4b506ef25234e8606987119adb81dea3 (patch) | |
| tree | a90512efaecce7636c9edfbea4bc8b65f6e8f7e9 /python | |
| parent | fa46d11e2e70bd854c1d8dd20118665b1f787a87 (diff) | |
| parent | 98c6d04df4325dcf7c3c83b25879df9fc8c9b9d3 (diff) | |
Merge pull request #3504 from pherl/3.4.x
Prefer system distributed binaries/libraries.
Diffstat (limited to 'python')
| -rwxr-xr-x | python/release/wheel/protobuf_optimized_pip.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/python/release/wheel/protobuf_optimized_pip.sh b/python/release/wheel/protobuf_optimized_pip.sh index 469661aa..064d1d2a 100755 --- a/python/release/wheel/protobuf_optimized_pip.sh +++ b/python/release/wheel/protobuf_optimized_pip.sh @@ -47,6 +47,9 @@ cd $DIR/protobuf-${PROTOBUF_VERSION} sed -i '/AC_PROG_OBJC/d' configure.ac sed -i 's/conformance\/Makefile//g' configure.ac +# Use the /usr/bin/autoconf and related tools to pick the correct aclocal macros +export PATH="/usr/bin:$PATH" + # Build protoc ./autogen.sh CXXFLAGS="-fPIC -g -O2" ./configure |