diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-11-24 09:27:25 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-11-24 16:58:55 -0800 |
| commit | ceb642fbdb948907b9010bb2eb2d03cf25d5ff7c (patch) | |
| tree | 8ab04076bd8909f71bd9e55ac082fa55d98a2bc5 /scripts | |
| parent | 160c7c56eff51ac715b4150a2a883b4f7809365f (diff) | |
| download | subsurface-ceb642fbdb948907b9010bb2eb2d03cf25d5ff7c.tar.gz | |
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 <dirk@hohndel.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build.sh | 6 |
1 files changed, 4 insertions, 2 deletions
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 |