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: only modify googlemaps .qmake.conf on Mac

Browse source 
This otherwise causes a failure on Linux builds.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2017-11-24 08:00:42 -08:00
parent f3c06279f1
commit 82a1757e09
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/build.sh
View file

@ -451,8 +451,10 @@ if [ "$SKIP_GOOGLEMAPS" != "1" ] ; then
git checkout master git checkout master
git pull --rebase git pull --rebase
# remove the qt_build_config from .qmake.conf as that fails on Travis if [ $PLATFORM = "Darwin" ] ; then
sed -i '' 's/.*qt_build_config.*//' .qmake.conf # remove the qt_build_config from .qmake.conf as that fails on Travis
sed -i 's/.*qt_build_config.*//' .qmake.conf
fi
mkdir -p build mkdir -p build
cd build cd build