summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-09-23 12:31:26 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-09-24 12:18:56 -0400
commitac6575065b07d6e3594fb453bed3ce0447512b74 (patch)
tree2ee8a6cd8aa35061ff7f7460d761dce7753f6945
parent142b59246e13b6801f49d79bd029f57fdd2f7d45 (diff)
downloadqtlocation-mapboxgl-ac6575065b07d6e3594fb453bed3ce0447512b74.tar.gz
[osx] build OS X with Xcode 7
patch mason to set 'tbh' MASON_DYNLIB_SUFFIX on iOS 9+ and OS X 10.11+
m---------.mason0
-rw-r--r--.travis.yml8
2 files changed, 4 insertions, 4 deletions
diff --git a/.mason b/.mason
-Subproject d8597d944533dbb5e28d08dfdba22a82c93171b
+Subproject 36dc9282d7b79b4533c511529d6f83fe5719f67
diff --git a/.travis.yml b/.travis.yml
index 6d7d31123e..f9d22b51e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- os: osx
- osx_image: xcode6.4
+ osx_image: xcode7
env: FLAVOR=osx BUILDTYPE=Debug
- os: osx
osx_image: xcode7
@@ -77,15 +77,15 @@ matrix:
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
- os: osx
- osx_image: xcode6.4
+ osx_image: xcode7
compiler: clang
env: FLAVOR=node NODE_VERSION=iojs-v3
- os: osx
- osx_image: xcode6.4
+ osx_image: xcode7
compiler: clang
env: FLAVOR=node NODE_VERSION=0.12
- os: osx
- osx_image: xcode6.4
+ osx_image: xcode7
compiler: clang
env: FLAVOR=node NODE_VERSION=0.10