diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-12-07 13:36:35 +0200 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-12-18 17:55:38 +0200 |
| commit | de8688b663c60d38ef7251760694d8bb2a29424e (patch) | |
| tree | 696ee777546d194cb91c16b30331e6adf45bea3e | |
| parent | e91cab516c42185ff21800394fd5bbe26cb86ad2 (diff) | |
| download | qtlocation-mapboxgl-upstream/linux-clang-3.8-libcxx-debug.tar.gz | |
[build] linux-clang39-debug → linux-clang-3.8-libcxx-debugupstream/linux-clang-3.8-libcxx-debug
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | circle.yml | 5 |
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 |