mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build.sh: don't use sed -i

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2017-11-24 09:27:25 -08:00
parent 160c7c56ef
commit ceb642fbdb
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/build.sh
View file

@ -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