diff options
| author | Adam Cozzette <acozzette@google.com> | 2019-03-25 11:00:19 -0700 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2019-03-25 11:00:19 -0700 |
| commit | 34b64995ac24620c88333b84228adfe694921300 (patch) | |
| tree | 2a5082178efe30264454303878c3f3ec6ad495cb /protoc-artifacts | |
| parent | ba42cb53d92a19f87a65061af15b10432ee7fc67 (diff) | |
| download | protobuf-34b64995ac24620c88333b84228adfe694921300.tar.gz | |
Avoid linking against libatomic when building protoc (#5922)
We ran into problems with precompiled protoc binaries not working on
some systems because of the dependence on a dynamically linked
libatomic. However, I found that linking against libatomic is not
actually necessary in our protoc build environment. Inside configure.ac
there's a test which figures out if we need to pass -latomic, and it
does this by attempting to build a test binary. That binary was failing
to build, but it turns out this was because we need to pass -std=c++11,
not -latomic.
This fixes #5875.
Diffstat (limited to 'protoc-artifacts')
| -rwxr-xr-x | protoc-artifacts/build-protoc.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protoc-artifacts/build-protoc.sh b/protoc-artifacts/build-protoc.sh index 305cf21ad..54b75a6d8 100755 --- a/protoc-artifacts/build-protoc.sh +++ b/protoc-artifacts/build-protoc.sh @@ -140,9 +140,9 @@ checkDependencies () host_machine="$(uname -m)"; dump_cmd='ldd '"$1" if [[ "$ARCH" == x86_32 ]]; then - white_list="linux-gate\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux\.so\.2\|libatomic\.so\.1" + white_list="linux-gate\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux\.so\.2" elif [[ "$ARCH" == x86_64 ]]; then - white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-x86-64\.so\.2\|libatomic\.so\.1" + white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-x86-64\.so\.2" elif [[ "$ARCH" == ppcle_64 ]]; then if [[ $host_machine != ppc64le ]];then dump_cmd='objdump -p '"$1"' | grep NEEDED' |