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

Reviewed-by: Emilia Käsper <emilia@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-06 23:34:49 +01:00
parent eb77e8886d
commit de439d4428

View File

@ -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