Browse Source

build: Fix detection of OpenSSL on OS X with HomeBrew

Change-Id: Ibcbc9516cf3b47eaab446bd51eb70917226c8104
Refs: #3697
pull/6/head
Alexander Afanasyev 9 years ago
parent
commit
750472b63d
  1. 1
      .jenkins.d/00-deps.sh
  2. 2
      .waf-tools/openssl.py

1
.jenkins.d/00-deps.sh

@ -13,7 +13,6 @@ if has OSX $NODE_LABELS; then
brew update
brew upgrade
brew install boost pkg-config cryptopp openssl $EXTRA_FLAGS
brew link --force openssl
brew cleanup
fi

2
.waf-tools/openssl.py

@ -23,7 +23,7 @@ from waflib import Utils, Logs
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):

Loading…
Cancel
Save