From b7aacc3ac33c9c239e8187a3ad595afb8e49ce79 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Wed, 9 Mar 2016 16:05:13 +0100
Subject: [PATCH] Restore building out of source with the unified build scheme
Reviewed-by: Matt Caswell <matt@openssl.org>
---
.travis.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 82fada2c76..ce7e208dbe 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
--
2.25.1