From e2eaded47068c7b87bc112609eb77afab18665aa Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Sat, 24 Mar 2018 18:17:35 +0100 Subject: Don't set -std=c89 in CMakeLists.txt This allows us to take advantage of newer features when they are available. However, builds on Travis still use -std=c89 to ensure C89 compatibility. Locally this can be achieved with either * cmake -DCMAKE_C_STANDARD=90 .. * cmake -DCMAKE_C_FLAGS='-std=c89' .. * C_FLAGS='-std=c89' cmake .. We also reorder the warning flags: they are all part of the standard build now, but -Werror is only applied on Travis. Fixes #892. --- travis/linux_clang/install.sh | 2 +- travis/linux_gcc/install.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'travis') diff --git a/travis/linux_clang/install.sh b/travis/linux_clang/install.sh index cacb3f85..32ce30f0 100755 --- a/travis/linux_clang/install.sh +++ b/travis/linux_clang/install.sh @@ -4,4 +4,4 @@ set -e export CCACHE_CPP2=yes -CC="ccache clang" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -fsanitize=address -O2" ./travis/install.sh +CC="ccache clang" CFLAGS="-std=c89 -Werror -fsanitize=address" ./travis/install.sh diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh index 6910322c..77e9a2e3 100755 --- a/travis/linux_gcc/install.sh +++ b/travis/linux_gcc/install.sh @@ -4,5 +4,4 @@ set -e export CCACHE_CPP2=yes -# -Wfloat-conversion not available for gcc 4.8 -CC="ccache gcc" CFLAGS="-std=c89 -g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -O2" ./travis/install.sh +CC="ccache gcc" CFLAGS="-std=c89 -Werror" ./travis/install.sh -- cgit v1.2.3