diff options
| -rwxr-xr-x | travis/install.sh | 1 | ||||
| -rwxr-xr-x | travis/linux_clang/install.sh | 2 | ||||
| -rwxr-xr-x | travis/linux_gcc/install.sh | 3 | ||||
| -rwxr-xr-x | travis/osx/install.sh | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/travis/install.sh b/travis/install.sh index 17280451..41f9fcb6 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -88,6 +88,7 @@ mkdir share ln -s nad share/proj pwd # install pyproj +export CFLAGS= PROJ_DIR=`pwd` pip3 install -v --user pyproj cd test/gigs diff --git a/travis/linux_clang/install.sh b/travis/linux_clang/install.sh index fad21a16..56e16ce6 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" ./travis/install.sh +CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh diff --git a/travis/linux_gcc/install.sh b/travis/linux_gcc/install.sh index f5e12dbd..571e02b7 100755 --- a/travis/linux_gcc/install.sh +++ b/travis/linux_gcc/install.sh @@ -4,4 +4,5 @@ set -e export CCACHE_CPP2=yes -CC="ccache gcc" ./travis/install.sh +# -Wfloat-conversion not available for gcc 4.8 +CC="ccache gcc" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -O2" ./travis/install.sh diff --git a/travis/osx/install.sh b/travis/osx/install.sh index fad21a16..56e16ce6 100755 --- a/travis/osx/install.sh +++ b/travis/osx/install.sh @@ -4,4 +4,4 @@ set -e export CCACHE_CPP2=yes -CC="ccache clang" ./travis/install.sh +CC="ccache clang" CFLAGS="-g -Wall -Wextra -Werror -Wunused-parameter -Wmissing-prototypes -Wmissing-declarations -Wformat -Werror=format-security -Wshadow -Wfloat-conversion -O2" ./travis/install.sh |