mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build.sh: remove unsupported compiler options for googlemaps

Browse source 
Trusty (Travis) doesn't support -std=c++1z and -Wdate-time - and the
module doesn't need them.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-08-03 07:34:55 -07:00
parent c979d9f166
commit 1e62120534
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/build.sh
View file

@ -450,6 +450,10 @@ else
QMAKE=qmake QMAKE=qmake
fi fi
$QMAKE PREFIX=$INSTALL_ROOT ../googlemaps.pro $QMAKE PREFIX=$INSTALL_ROOT ../googlemaps.pro
# on Travis the compiler doesn't support c++1z, yet qmake adds that flag;
# since things compile fine with c++11, let's just hack that away
# similarly, don't use -Wdata-time
sed -i 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' Makefile
make -j4 make -j4
make install make install