diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-02 19:53:18 -0600 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2016-01-03 09:59:08 -0600 |
commit | f3184d202190a5e6e1bcc7b6e2bddf29130be735 (patch) | |
tree | db833bda2be987d486da176aa4b32e2543be8802 /.travis/run.sh | |
parent | ad3020ef8b7a67d55e68405598a0f94678dffd6d (diff) | |
download | cryptography-f3184d202190a5e6e1bcc7b6e2bddf29130be735.tar.gz cryptography-f3184d202190a5e6e1bcc7b6e2bddf29130be735.tar.bz2 cryptography-f3184d202190a5e6e1bcc7b6e2bddf29130be735.zip |
refactor travis custom openssl code to work with other versions
Diffstat (limited to '.travis/run.sh')
-rwxr-xr-x | .travis/run.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.travis/run.sh b/.travis/run.sh index 23b9e89e..c8707a4f 100755 --- a/.travis/run.sh +++ b/.travis/run.sh @@ -24,10 +24,14 @@ else eval "$(pyenv init -)" fi if [[ "${OPENSSL}" == "0.9.8" ]]; then - export PATH="$HOME/ossl-098l/bin:$PATH" - export CFLAGS="-I$HOME/ossl-098l/include" - export LDFLAGS="-L$HOME/ossl-098l/lib" - export LD_LIBRARY_PATH="$HOME/ossl-098l/lib" + OPENSSL_DIR="ossl-098l" + fi + + if [ ! -z "$OPENSSL_DIR" ]; then + export PATH="$HOME/$OPENSSL_DIR/bin:$PATH" + export CFLAGS="-I$HOME/$OPENSSL_DIR/include" + # rpath on linux will cause it to use an absolute path so we don't need to do LD_LIBRARY_PATH + export LDFLAGS="-L$HOME/$OPENSSL_DIR/lib -Wl,-rpath=$HOME/$OPENSSL_DIR/lib" fi fi source ~/.venv/bin/activate |