aboutsummaryrefslogtreecommitdiff
path: root/travis/install.sh
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-02-24 11:12:37 +0100
committerEven Rouault <even.rouault@spatialys.com>2019-02-24 11:55:26 +0100
commit516641cfb6a1797991da1ad10fc40096cf7413ab (patch)
treea81353168b31d8a3c610b6c6b39d9b518b4a5890 /travis/install.sh
parent70158c3302f087e6ddd71cf8414e5436b44bc71b (diff)
downloadPROJ-516641cfb6a1797991da1ad10fc40096cf7413ab.tar.gz
PROJ-516641cfb6a1797991da1ad10fc40096cf7413ab.zip
.travis.yml: add build with g++-7 and -D_GLIBCXX_ASSERTIONS (refs #1290)
Diffstat (limited to 'travis/install.sh')
-rwxr-xr-xtravis/install.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/travis/install.sh b/travis/install.sh
index 2013a610..f5fa7d08 100755
--- a/travis/install.sh
+++ b/travis/install.sh
@@ -23,7 +23,7 @@ cd $TAR_DIRECTORY
mkdir build_autoconf
cd build_autoconf
if [ -f /usr/lib/jvm/java-7-openjdk-amd64/include/jni.h ]; then
- CXXFLAGS="-I/usr/lib/jvm/java-7-openjdk-amd64/include -I/usr/lib/jvm/java-7-openjdk-amd64/include/linux" ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all --with-jni
+ CXXFLAGS="-I/usr/lib/jvm/java-7-openjdk-amd64/include -I/usr/lib/jvm/java-7-openjdk-amd64/include/linux $CXXFLAGS" ../configure --prefix=/tmp/proj_autoconf_install_from_dist_all --with-jni
else
../configure --prefix=/tmp/proj_autoconf_install_from_dist_all
fi