From: Richard Levitte <levitte@openssl.org>
Date: Sun, 6 Mar 2016 22:34:49 +0000 (+0100)
Subject: For unified builds, make a separate build directory and build there
X-Git-Tag: OpenSSL_1_1_0-pre4~240
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de439d4428934b58581993ca0aae39858effc005;p=openssl

For unified builds, make a separate build directory and build there

Reviewed-by: Emilia Käsper <emilia@openssl.org>
---

diff --git a/.travis.yml b/.travis.yml
index 0cbc052423..f1c43cc414 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,20 +58,31 @@ matrix:
 before_script:
     - sh .travis-create-release.sh $TRAVIS_OS_NAME
     - tar -xvzf _srcdist.tar.gz
-    - cd _srcdist
+    - if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then
+          srcdir=../_srcdir;
+          mkdir _build;
+          cd _build;
+      else
+          srcdir=.;
+          cd _srcdist;
+      fi
     - if [ "$CC" == i686-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
+          $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format;
       elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then
           export CROSS_COMPILE=${CC%%gcc}; unset CC;
-          ./Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
+          $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
       else
-          ./config $CONFIG_OPTS;
+          $srcdir/config $CONFIG_OPTS;
       fi
     - cd ..
 
 script:
-    - cd _srcdist
+    - if expr "$CONFIG_OPTS" : "--unified"; then
+          cd _build;
+      else
+          cd _srcdist;
+      fi
     - make
     - if [ -z "$BUILDONLY" ]; then
           if [ -n "$CROSS_COMPILE" ]; then