diff options
| author |  Adam Cozzette <acozzette@google.com> | 2018-07-06 12:38:14 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2018-07-06 12:38:14 -0700 |
| commit | 65e76f5289ec0bd919a68481afb75086bfb0365a (patch) | |
| tree | cb8e78ce360f2eead6d88c7a0551bc4bf0823de5 /protoc-artifacts/build-protoc.sh | |
| parent | 79700b56b99fa5c8c22ddef78e6c9557ff711379 (diff) | |
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 b78abbcf..42a12b21 100755 --- a/protoc-artifacts/build-protoc.sh +++ b/protoc-artifacts/build-protoc.sh @@ -130,7 +130,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' |