diff options
| author |  Murillo Bernardes <mfbernardes@gmail.com> | 2018-04-06 13:38:15 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-04-06 10:31:07 -0700 |
| commit | 882120ba65bca664b3bd5c87da247f6deaa40cbb (patch) | |
| tree | 9f702c5e5568eada053a003b0ee46c2cbc16a99c | |
| parent | 07366daea56583021adbf27f52e5e8c6c335bfe7 (diff) | |
| download | subsurface-882120ba65bca664b3bd5c87da247f6deaa40cbb.tar.gz | |
ios: remove googlemaps unecessary multiple builds
googlemaps archive is a fat file already, containing
armv7, arm64 and x86-64, so no need to build it
multiple times.
Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
| -rw-r--r-- | packaging/ios/build.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 2954f165a..738e7a1c3 100644 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -294,18 +294,18 @@ echo next building for $ARCH popd fi -# build googlemaps - if [ ! -d googlemaps ] ; then - git clone git://github.com/subsurface-divelog/googlemaps - fi - mkdir -p googlemaps-build-$ARCH - pushd googlemaps-build-$ARCH - ${IOS_QT}/${QT_VERSION}/ios/bin/qmake ../googlemaps/googlemaps.pro - make - make install - popd done +# build googlemaps +if [ ! -d googlemaps ] ; then + git clone git://github.com/subsurface-divelog/googlemaps +fi +mkdir -p googlemaps-build +pushd googlemaps-build +${IOS_QT}/${QT_VERSION}/ios/bin/qmake ../googlemaps/googlemaps.pro CONFIG+=release +make +popd + # now combine the arm libraries into fat libraries rm -rf install-root cp -a install-root-arm64 install-root |