From d926d0c6e563d52500c09b260f350d4c9bad7f85 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Tue, 30 Jun 2015 09:13:51 -0700 Subject: [PATCH] Manually set lib and include dirs on linux builds --- .travis.yml | 7 +++++-- 1 file 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"))