diff options
| author | iphydf <iphydf@users.noreply.github.com> | 2016-08-24 23:52:34 +0100 |
|---|---|---|
| committer | iphydf <iphydf@users.noreply.github.com> | 2016-09-16 11:22:23 +0100 |
| commit | 37c041f8159f7e89f2585243e9b8073f47d77fd1 (patch) | |
| tree | ed1f983a231f5bf7d2c24ce994feb55ee4953cda /other/travis/autotools-script | |
| parent | c0d84ab48977f6ea80e8b5f7eca04423d4a31d26 (diff) | |
Clean up Travis build a bit in preparation for osx/win.
Diffstat (limited to 'other/travis/autotools-script')
| -rwxr-xr-x | other/travis/autotools-script | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/other/travis/autotools-script b/other/travis/autotools-script index 5448aac5..cc536ab9 100755 --- a/other/travis/autotools-script +++ b/other/travis/autotools-script | |||
| @@ -1,8 +1,5 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | set -e -u -x | ||
| 4 | . other/travis/env-$ENV.sh | ||
| 5 | |||
| 6 | # Build toxcore and run tests. | 3 | # Build toxcore and run tests. |
| 7 | ./autogen.sh | 4 | ./autogen.sh |
| 8 | ./configure \ | 5 | ./configure \ |
| @@ -10,8 +7,7 @@ set -e -u -x | |||
| 10 | --with-libsodium-headers=$CACHE_DIR/include \ | 7 | --with-libsodium-headers=$CACHE_DIR/include \ |
| 11 | --enable-daemon \ | 8 | --enable-daemon \ |
| 12 | --enable-logging \ | 9 | --enable-logging \ |
| 13 | --enable-ntox \ | 10 | --enable-ntox |
| 14 | CFLAGS="-DTRAVIS_ENV=1" | ||
| 15 | 11 | ||
| 16 | # We use make instead of RUN $MAKE here, because the autotools build will only | 12 | # We use make instead of RUN $MAKE here, because the autotools build will only |
| 17 | # ever run natively on the Linux container, never on a Windows cross compilation | 13 | # ever run natively on the Linux container, never on a Windows cross compilation |