aboutsummaryrefslogtreecommitdiff
path: root/travis
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2018-03-25 10:08:28 +0200
committerGitHub <noreply@github.com>2018-03-25 10:08:28 +0200
commitbbf98610880944e8af75fe74c1c0cd2427d94d17 (patch)
treec9399ea8be19a5ab89d2efab4ec3177a695019a8 /travis
parent939d78d1c3b294ee12bc9ac34d90b9a2d6a35c2f (diff)
parente2eaded47068c7b87bc112609eb77afab18665aa (diff)
downloadPROJ-bbf98610880944e8af75fe74c1c0cd2427d94d17.tar.gz
PROJ-bbf98610880944e8af75fe74c1c0cd2427d94d17.zip
Merge pull request #898 from aaronpuchert/compile-flags
Don't set -std=c89 in CMakeLists.txt
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/linux_clang/install.sh2
-rwxr-xr-xtravis/linux_gcc/install.sh3
2 files changed, 2 insertions, 3 deletions
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