osx: test that will support both latest (10.12) and oldest with c++11…

… support: 10.7
mapbox · Dec 17, 2016 · 4923eb5 · 4923eb5
1 parent 18a8055
commit 4923eb5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -68,7 +68,11 @@ matrix:
         - export PATH=$(./.mason/mason prefix clang++ 3.9.0)/bin:${PATH}
     - os: osx
       osx_image: xcode8
-      env: TEST_GYP_BUILD=True
+      env: OSX_OLDEST_SUPPORTED=10.7 TEST_GYP_BUILD=True
+      compiler: clang
+    - os: osx
+      osx_image: xcode8
+      env: OSX_OLDEST_SUPPORTED=10.12
       compiler: clang
     - os: linux
       compiler: "clang35"

diff --git a/Makefile b/Makefile
@@ -24,7 +24,10 @@ ifeq ($(OS), Linux)
   EXTRA_FLAGS = -pthread
 endif
 ifeq ($(OS), Darwin)
-  EXTRA_FLAGS = -mmacosx-version-min=10.8
+  OSX_OLDEST_SUPPORTED ?= 10.7
+  # we need to explicitly ask for libc++ otherwise the
+  # default will flip back to libstdc++ for mmacosx-version-min < 10.9
+  EXTRA_FLAGS = -stdlib=libc++ -mmacosx-version-min=$(OSX_OLDEST_SUPPORTED)
 endif