From ceb642fbdb948907b9010bb2eb2d03cf25d5ff7c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 24 Nov 2017 09:27:25 -0800 Subject: build.sh: don't use sed -i I can't seem to find a way to make this work on both Linux and Mac. Signed-off-by: Dirk Hohndel --- scripts/build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 0e350de23..d10f07e52 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -453,7 +453,8 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then if [ $PLATFORM = "Darwin" ] ; then # remove the qt_build_config from .qmake.conf as that fails on Travis - sed -i 's/.*qt_build_config.*//' .qmake.conf + mv .qmake.conf .qmake.conf.bak + cat .qmake.conf.bak | sed -e 's/.*qt_build_config.*//' > .qmake.conf fi mkdir -p build @@ -463,7 +464,8 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then # 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 + mv Makefile Makefile.bak + cat Makefile.bak | sed -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' > Makefile make -j4 make install fi -- cgit v1.2.3-70-g09d2