The branch master has been updated
via b7aacc3ac33c9c239e8187a3ad595afb8e49ce79 (commit)
from 467bbe090bdb697d3edd5fba30917ec692d7e175 (commit)
- Log -----------------------------------------------------------------
commit b7aacc3ac33c9c239e8187a3ad595afb8e49ce79
Author: Richard Levitte <[email protected]>
Date: Wed Mar 9 16:05:13 2016 +0100
Restore building out of source with the unified build scheme
Reviewed-by: Matt Caswell <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 82fada2..ce7e208 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,16 +60,16 @@ matrix:
before_script:
- sh .travis-create-release.sh $TRAVIS_OS_NAME
- tar -xvzf _srcdist.tar.gz
- - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then
+ - if echo "$CONFIG_OPTS" | grep "--classic" >/dev/null; then
+ srcdir=.;
+ cd _srcdist;
+ else
srcdir=../_srcdir;
mkdir _build;
cd _build;
if which ccache >/dev/null; then
CC="ccache $CC";
fi
- else
- srcdir=.;
- cd _srcdist;
fi
- if [ "$CC" == i686-w64-mingw32-gcc ]; then
export CROSS_COMPILE=${CC%%gcc}; unset CC;
@@ -83,10 +83,10 @@ before_script:
- cd ..
script:
- - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then
- cd _build;
- else
+ - if echo "$CONFIG_OPTS" | grep "--classic" >/dev/null; then
cd _srcdist;
+ else
+ cd _build;
fi
- make
- if [ -z "$BUILDONLY" ]; then
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
