From 5c265faedbd93d867871c8739ae46e8f7f347434 Mon Sep 17 00:00:00 2001 From: Kun Zhang Date: Tue, 7 Apr 2015 21:06:37 -0700 Subject: Fix osx dependency check. otool prints the file name in the first line. Should skip it --- protoc-artifacts/build-protoc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'protoc-artifacts/build-protoc.sh') 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 -- cgit v1.2.3