Restore building out of source with the unified build scheme

Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte 2016-03-09 16:05:13 +01:00
parent 467bbe090b
commit b7aacc3ac3

View File

@ -60,16 +60,16 @@ matrix:
before_script: before_script:
- sh .travis-create-release.sh $TRAVIS_OS_NAME - sh .travis-create-release.sh $TRAVIS_OS_NAME
- tar -xvzf _srcdist.tar.gz - 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; srcdir=../_srcdir;
mkdir _build; mkdir _build;
cd _build; cd _build;
if which ccache >/dev/null; then if which ccache >/dev/null; then
CC="ccache $CC"; CC="ccache $CC";
fi fi
else
srcdir=.;
cd _srcdist;
fi fi
- if [ "$CC" == i686-w64-mingw32-gcc ]; then - if [ "$CC" == i686-w64-mingw32-gcc ]; then
export CROSS_COMPILE=${CC%%gcc}; unset CC; export CROSS_COMPILE=${CC%%gcc}; unset CC;
@ -83,10 +83,10 @@ before_script:
- cd .. - cd ..
script: script:
- if echo "$CONFIG_OPTS" | grep "--unified" >/dev/null; then - if echo "$CONFIG_OPTS" | grep "--classic" >/dev/null; then
cd _build;
else
cd _srcdist; cd _srcdist;
else
cd _build;
fi fi
- make - make
- if [ -z "$BUILDONLY" ]; then - if [ -z "$BUILDONLY" ]; then