Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
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
brpc
Commits
e2556046
Unverified
Commit
e2556046
authored
5 years ago
by
Ge Jun
Committed by
GitHub
5 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #770 from gavinchou/master
Fix compilation errors caused by ssl on MacOS
parents
7e85374b
0664bb90
master
0.9.8-rc01
0.9.7
0.9.7-rc03
0.9.7-rc02
0.9.7-rc01
0.9.6
0.9.6-rc03
0.9.6-rc02
0.9.6-rc01
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
config_brpc.sh
config_brpc.sh
+4
-1
No files found.
config_brpc.sh
View file @
e2556046
...
...
@@ -136,6 +136,9 @@ find_dir_of_header_or_die() {
$ECHO
$dir
}
# User specified path of openssl, if not given it's empty
OPENSSL_LIB
=
$(
find_dir_of_lib ssl
)
# Inconvenient to check these headers in baidu-internal
#PTHREAD_HDR=$(find_dir_of_header_or_die pthread.h)
OPENSSL_HDR
=
$(
find_dir_of_header_or_die openssl/ssl.h
)
...
...
@@ -233,7 +236,7 @@ PROTOBUF_HDR=$(find_dir_of_header_or_die google/protobuf/message.h)
LEVELDB_HDR
=
$(
find_dir_of_header_or_die leveldb/db.h
)
HDRS
=
$(
$ECHO
"
$GFLAGS_HDR
\n
$PROTOBUF_HDR
\n
$LEVELDB_HDR
\n
$OPENSSL_HDR
"
|
sort
|
uniq
)
LIBS
=
$(
$ECHO
"
$GFLAGS_LIB
\n
$PROTOBUF_LIB
\n
$LEVELDB_LIB
\n
$SNAPPY_LIB
"
|
sort
|
uniq
)
LIBS
=
$(
$ECHO
"
$GFLAGS_LIB
\n
$PROTOBUF_LIB
\n
$LEVELDB_LIB
\n
$
OPENSSL_LIB
\n
$
SNAPPY_LIB
"
|
sort
|
uniq
)
absent_in_the_list
()
{
TMP
=
`
$ECHO
"
$1
\n
$2
"
|
sort
|
uniq
`
...
...
This diff is collapsed.
Click to expand it.
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