diff options
| author | Kun Zhang <zhangkun@google.com> | 2015-04-07 21:06:37 -0700 |
|---|---|---|
| committer | Kun Zhang <zhangkun@google.com> | 2015-04-07 21:06:37 -0700 |
| commit | 5c265faedbd93d867871c8739ae46e8f7f347434 (patch) | |
| tree | cb265c96dd042b97eb2c803ae39cc66022bc01f9 /protoc-artifacts | |
| parent | 6f2bc19bb3401389b71b515a03fb7c144127efee (diff) | |
| download | protobuf-5c265faedbd93d867871c8739ae46e8f7f347434.tar.gz protobuf-5c265faedbd93d867871c8739ae46e8f7f347434.tar.bz2 protobuf-5c265faedbd93d867871c8739ae46e8f7f347434.zip | |
Fix osx dependency check. otool prints the file name in the first line. Should skip it
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 686010c0..4027f11e 100755 --- a/protoc-artifacts/build-protoc.sh +++ b/protoc-artifacts/build-protoc.sh @@ -51,7 +51,7 @@ assertEq () checkArch () { echo - echo "Checking for file format ..." + echo "Checking file format ..." if [[ "$OS" == windows || "$OS" == linux ]]; then format="$(objdump -f "$1" | grep -o "file format .*$" | grep -o "[^ ]*$")" echo Format=$format @@ -105,7 +105,7 @@ checkDependencies () white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-x86-64\.so\.2" fi elif [[ "$OS" == osx ]]; then - dump_cmd='otool -L '"$1" + dump_cmd='otool -L '"$1"' | fgrep dylib' white_list="libz\.1\.dylib\|libc++\.1\.dylib\|libSystem\.B\.dylib" fi if [[ -z "$white_list" || -z "$dump_cmd" ]]; then |