From 6b9e77ba01472070dd1ac9b87c9dcb068c49b852 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 6 Oct 2018 09:45:35 +0200 Subject: 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 --- scripts/build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3-70-g09d2