[incubator-brpc] branch master updated: Exclude mesalink/openssl/ssl.h when find openssl

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git


The following commit(s) were added to refs/heads/master by this push:
     new a7525c2  Exclude mesalink/openssl/ssl.h when find openssl
     new d3452d7  Merge pull request #1623 from wasphin/feature/exclude-mesalink
a7525c2 is described below

commit a7525c20ed7bbf4d2143e6d2c733a99da794cfe0
Author: wxf <xi...@bqvision.com>
AuthorDate: Thu Dec 2 09:37:17 2021 +0800

    Exclude mesalink/openssl/ssl.h when find openssl
    
    Resolve #1622
---
 config_brpc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config_brpc.sh b/config_brpc.sh
index 1720031..f52911d 100755
--- a/config_brpc.sh
+++ b/config_brpc.sh
@@ -161,7 +161,7 @@ else
     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)
+    OPENSSL_HDR=$(find_dir_of_header_or_die openssl/ssl.h mesalink/openssl/ssl.h)
 fi
 
 if [ $WITH_MESALINK != 0 ]; then

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@brpc.apache.org
For additional commands, e-mail: dev-help@brpc.apache.org