diff options
| author | Steven Fackler <[email protected]> | 2015-06-30 09:13:51 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-06-30 09:13:51 -0700 |
| commit | d926d0c6e563d52500c09b260f350d4c9bad7f85 (patch) | |
| tree | 52411cd3699b982979d16fb7a3c94eebd37c5684 | |
| parent | Revert "Don't build a custom openssl on OSX" (diff) | |
| download | rust-openssl-d926d0c6e563d52500c09b260f350d4c9bad7f85.tar.xz rust-openssl-d926d0c6e563d52500c09b260f350d4c9bad7f85.zip | |
Manually set lib and include dirs on linux builds
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 8d006d87..bbe6e35d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,8 @@ before_install: before_script: - ./openssl/test/test.sh script: -- (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test) -- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES")) +- (test $TRAVIS_OS_NAME != "osx" || cd openssl && cargo test) +- (test $TRAVIS_OS_NAME == "osx" || cd openssl && \ + OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test) +- (test $TRAVIS_OS_NAME == "osx" || (cd openssl && \ + OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include LD_LIBRARY_PATH=/usr/lib:$LD_LIBRARY_PATH cargo test --features "$FEATURES")) |