travis: fix CFLAGS assignment error and add -Werror only when compiling on 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>

diff --git a/.travis/build-check.sh b/.travis/build-check.sh
index 250bb4548b50be8ed98992a89efca8425e09262b..f794704cab2304bf02032faa92dbe64b588f9400 100755 (executable)
--- 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:-}