mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 12:02:28 +02:00
Code

travis: fix CFLAGS assignment error and add -Werror only when compiling on Linux for Linux

Browse Source 
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>
This commit is contained in:
Antonio Quartulli 2019-11-10 21:17:18 +01:00 committed by Gert Doering
parent fb8033d49b
commit e0fbb584b8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis/build-check.sh
View File

@ -8,7 +8,6 @@ fi
if [ "${TRAVIS_OS_NAME}" = "linux" ]; then if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}" export LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH:-}"
export CFLAGS="${CFLAGS} -Werror"
fi fi
if [ "${TRAVIS_OS_NAME}" = "osx" ]; then if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
@ -18,10 +17,15 @@ fi
autoreconf -vi autoreconf -vi
if [ -z ${CHOST+x} ]; then 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) ./configure --with-crypto-library="${SSLLIB}" ${EXTRA_CONFIG:-} || (cat config.log && exit 1)
make -j$JOBS make -j$JOBS
src/openvpn/openvpn --version || true 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 if [ "${TRAVIS_OS_NAME}" = "osx" ]; then otool -L src/openvpn/openvpn; fi
make check make check
${EXTRA_SCRIPT:-} ${EXTRA_SCRIPT:-}