commit 750472b63d7df6254540356bb09647132b1e3104
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 05 12:07:13 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Aug 05 12:08:01 2016 -0700
tree 8a955ef95b941f0b96f0a89cb6b3689139004109
parent 5537d13e564b41941b0c253fa718e0645b23e384

build: Fix detection of OpenSSL on OS X with HomeBrew

Change-Id: Ibcbc9516cf3b47eaab446bd51eb70917226c8104
Refs: #3697

.jenkins.d/00-deps.sh

diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index c07798a..d54374b 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -13,7 +13,6 @@
     brew update
     brew upgrade
     brew install boost pkg-config cryptopp openssl $EXTRA_FLAGS
-    brew link --force openssl
     brew cleanup
 fi
 

.waf-tools/openssl.py

diff --git a/.waf-tools/openssl.py b/.waf-tools/openssl.py
index ec0dad1..de0f9dc 100644
--- a/.waf-tools/openssl.py
+++ b/.waf-tools/openssl.py
@@ -23,7 +23,7 @@
 from waflib.Configure import conf
 
 OPENSSL_VERSION_FILE = 'opensslv.h'
-OPENSSL_DIR_OSX = ['/usr/local', '/opt/local']
+OPENSSL_DIR_OSX = ['/usr/local', '/opt/local', '/usr/local/opt/openssl']
 OPENSSL_DIR = ['/usr', '/usr/local', '/opt/local', '/sw']
 
 def options(opt):