summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-12-07 13:36:35 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-12-19 12:20:48 +0200
commitf2d781ad55ab13a586cbf2b498d12364b50e4c38 (patch)
treea6f2714ec4a4d8169838e34f3e0a29c86d3a2f9a
parent757cc0f2be1c0972f9b74a91ed873fe8a892f27f (diff)
downloadqtlocation-mapboxgl-f2d781ad55ab13a586cbf2b498d12364b50e4c38.tar.gz
[build] linux-clang39-debug → linux-clang-3.8-libcxx-debug
-rw-r--r--CMakeLists.txt8
-rw-r--r--circle.yml5
2 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30436b6298..88368abbd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,9 +13,13 @@ option(WITH_EGL "Use EGL backend" OFF)
if(WITH_CXX11ABI)
set(MASON_CXXABI_SUFFIX -cxx11abi)
- add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
+ endif()
else()
- add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
+ endif()
endif()
if(WITH_OSMESA AND WITH_EGL)
diff --git a/circle.yml b/circle.yml
index 4bd2f9ae17..2d0b82676e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -22,7 +22,7 @@ workflows:
filters:
tags:
only: /node-.*/
- - linux-clang39-debug
+ - linux-clang-3.8-libcxx-debug
- linux-clang4-sanitize-address
- linux-clang4-sanitize-undefined
- linux-clang4-sanitize-thread
@@ -448,7 +448,7 @@ jobs:
- *upload-render-tests-recycle-map
# ------------------------------------------------------------------------------
- linux-clang39-debug:
+ linux-clang-3.8-libcxx-debug:
docker:
- image: mbgl/7d2403f42e:linux-clang-3.9
working_directory: /src
@@ -457,6 +457,7 @@ jobs:
JOBS: 4
BUILDTYPE: Debug
WITH_EGL: 1
+ WITH_CXX11ABI: 1
steps:
- checkout
- *generate-cache-key