summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Morris <michael.patrick.morris@gmail.com>2015-05-12 17:07:54 -0400
committerMike Morris <michael.patrick.morris@gmail.com>2015-05-13 12:58:34 -0400
commit99b37c64f90ed1de0e8f56d7dc0133c68a36dbe8 (patch)
tree92090eaa71f9c65f03d44a9ce317137463a41e20
parent1b9f98440aa271f248b9d1c5a2d33561d34b8773 (diff)
downloadqtlocation-mapboxgl-99b37c64f90ed1de0e8f56d7dc0133c68a36dbe8.tar.gz
compile OS X with --std=c++1y
because Travis uses Apple LLVM 6.0 and full c++14 support landed in 6.1 https://developer.apple.com/library/ios/documentation/DeveloperTools/Conceptual/WhatsNewXcode/WhatsNewXcode.pdf
-rw-r--r--binding.gyp2
m---------vendor/mbgl14
2 files changed, 8 insertions, 8 deletions
diff --git a/binding.gyp b/binding.gyp
index 2fbd8f4d47..1f0f81c1fe 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -28,11 +28,11 @@
['OS=="mac"', {
'xcode_settings': {
'CLANG_CXX_LIBRARY': 'libc++',
- 'CLANG_CXX_LANGUAGE_STANDARD': 'c++14',
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'GCC_ENABLE_CPP_RTTI': 'YES',
'OTHER_CPLUSPLUSFLAGS': [
+ '-std=c++1y',
'-Werror',
'-Wall',
'-Wextra',
diff --git a/vendor/mbgl b/vendor/mbgl
-Subproject 4c89323f6d669d9d5f93469e677477b125242a5
+Subproject 1d38b636402a6581c491185090f5c81495a07d1