diff options
| author | Antonio Quartulli | 2019-11-10 21:17:18 +0100 |
|---|---|---|
| committer | Gert Doering | 2019-11-27 20:58:47 +0100 |
| commit | e0fbb584b8c4acba15feed7e30a778dde6389677 (patch) | |
| tree | 6e734b1e1835a045b9da7eb1e498249dcdbfdf0f /.travis | |
| parent | fb8033d49bbfb1b02e75d8d71d0ad891e07a1b06 (diff) | |
| download | openvpn-e0fbb584b8c4acba15feed7e30a778dde6389677.zip openvpn-e0fbb584b8c4acba15feed7e30a778dde6389677.tar.gz | |
travis: fix CFLAGS assignment error and add -Werror only when compiling on Linux for Linux
CFLAGS may not resolve to anything and the build-check.sh script would
just fail.
Switch to EXTRA_FLAGS and use proper substitution so that the script won't
error out when EXTRA_FLAGS is uninitialized.
At the same time ensure that such flag is set only when compiling *for*
linux (we use linux to also compile *for* windows)
Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <20191110201718.31032-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19109.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to '.travis')
| -rwxr-xr-x | .travis/build-check.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis/build-check.sh b/.travis/build-check.sh index 250bb45..f794704 100755 --- a/.travis/build-check.sh +++ b/.travis/build-check.sh @@ -8,7 +8,6 @@ fi if [ "${TRAVIS_OS_NAME}" = "linux" ]; then export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}" - export CFLAGS="${CFLAGS} -Werror" fi if [ "${TRAVIS_OS_NAME}" = "osx" ]; then @@ -18,10 +17,15 @@ fi autoreconf -vi if [ -z ${CHOST+x} ]; then + if [ "${TRAVIS_OS_NAME}" = "linux" ]; then + export EXTRA_CONFIG="${EXTRA_CONFIG:-} --enable-werror" + fi ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1) make -j$JOBS src/openvpn/openvpn --version || true - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ldd src/openvpn/openvpn; fi + if [ "${TRAVIS_OS_NAME}" = "linux" ]; then + ldd src/openvpn/openvpn; + fi if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L src/openvpn/openvpn; fi make check ${EXTRA_SCRIPT:-} |