diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2018-05-14 21:36:29 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-17 07:36:44 -0700 |
| commit | d12e842c6845b6afd9cc6070423e6e2338722a59 (patch) | |
| tree | 4ff8e2d10087e7b07a146203d136e72f05a4e731 /packaging/android | |
| parent | fa95a7c56aaeeeba9879552c85e1f85b0594d22c (diff) | |
| download | subsurface-d12e842c6845b6afd9cc6070423e6e2338722a59.tar.gz | |
android-build: Use sed -i instead of home rolled variant
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Diffstat (limited to 'packaging/android')
| -rwxr-xr-x | packaging/android/build.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packaging/android/build.sh b/packaging/android/build.sh index 4cc29e8df..e5c10562e 100755 --- a/packaging/android/build.sh +++ b/packaging/android/build.sh @@ -182,8 +182,7 @@ $QMAKE ../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 +sed -i.bak -e 's/std=c++1z/std=c++11/g ; s/-Wdate-time//' Makefile make -j4 QT_PLUGINS_PATH=`$QMAKE -query QT_INSTALL_PLUGINS` GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so |