diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 21 |
1 files changed, 16 insertions, 5 deletions
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 |