diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-08-03 07:34:55 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-08-03 11:19:49 -0700 |
| commit | 1e621205343bc87e655802043e661d1d68f5c214 (patch) | |
| tree | aaa2a199c8bdb1dc8ae970d0274a6b8e093d0525 /scripts | |
| parent | c979d9f16664c7dfcf04d6513fbc6f05b7e1e858 (diff) | |
| download | subsurface-1e621205343bc87e655802043e661d1d68f5c214.tar.gz | |
build.sh: remove unsupported compiler options for googlemaps
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index e5d833341..02802b03c 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -450,6 +450,10 @@ else QMAKE=qmake fi $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 install |