diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-10-06 09:45:35 +0200 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-07 14:00:45 -0700 |
| commit | 6b9e77ba01472070dd1ac9b87c9dcb068c49b852 (patch) | |
| tree | acf844a9aa8fbd03dda65e75da3aacbb2a0824c1 /scripts | |
| parent | 5c2181daa796b50901272cb74843cf575c3e90eb (diff) | |
| download | subsurface-6b9e77ba01472070dd1ac9b87c9dcb068c49b852.tar.gz | |
build-system: minor cleanup of build.sh
That qmake -query was added for debugging a long time ago.
Since the comment clearly indicate that the edit of the Makefile is only
for Travis, let's only do it when running on Travis.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/build.sh b/scripts/build.sh index 96179bcc4..9e5f7f826 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -430,13 +430,14 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then mkdir -p build mkdir -p J10build cd build - $QMAKE -query $QMAKE "INCLUDEPATH=$INSTALL_ROOT/include" ../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 - mv Makefile Makefile.bak - cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile + if [ "$TRAVIS" = "true" ] ; then + mv Makefile Makefile.bak + cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile + fi make -j4 make install popd |