Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
5c265fae
Commit
5c265fae
authored
Apr 08, 2015
by
Kun Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix osx dependency check. otool prints the file name in the first line. Should skip it
parent
6f2bc19b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
build-protoc.sh
protoc-artifacts/build-protoc.sh
+2
-2
No files found.
protoc-artifacts/build-protoc.sh
View file @
5c265fae
...
...
@@ -51,7 +51,7 @@ assertEq ()
checkArch
()
{
echo
echo
"Checking f
or f
ile 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment