diff options
| author | Adam Cozzette <acozzette@google.com> | 2018-07-06 12:38:14 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-17 16:52:43 -0700 |
| commit | 6fc2bac3f36e564e1c5e1171788ada13aff0d355 (patch) | |
| tree | 80d78ed932c13e80b28fff7c55ad4bb18539fd3a /protoc-artifacts/build-protoc.sh | |
| parent | b3e4e3abe0d2f79ec9f1e4e24e12dc642d662546 (diff) | |
| download | protobuf-6fc2bac3f36e564e1c5e1171788ada13aff0d355.tar.gz protobuf-6fc2bac3f36e564e1c5e1171788ada13aff0d355.tar.bz2 protobuf-6fc2bac3f36e564e1c5e1171788ada13aff0d355.zip | |
Updated Docker setup to use GCC 4.8
Now that we depend on C++11, we need at least GCC 4.8 instead of 4.7.
This change updates the Docker setup to continue using CentOS 6.6 but
with GCC 4.8.
I also added libm to the whitelist for dynamically linked libraries for
the ARM64 protoc binary.
Diffstat (limited to 'protoc-artifacts/build-protoc.sh')
| -rwxr-xr-x | protoc-artifacts/build-protoc.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh index 7e1d4a89..b8d2eb87 100755 --- a/protoc-artifacts/build-protoc.sh +++ b/protoc-artifacts/build-protoc.sh @@ -150,7 +150,7 @@ checkDependencies () white_list="linux-vdso64\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|libz\.so\.1\|ld64\.so\.2" elif [[ "$ARCH" == aarch_64 ]]; then dump_cmd='objdump -p '"$1"' | grep NEEDED' - white_list="libpthread\.so\.0\|libc\.so\.6\|ld-linux-aarch64\.so\.1" + white_list="libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1" fi elif [[ "$OS" == osx ]]; then dump_cmd='otool -L '"$1"' | fgrep dylib' |