From de8688b663c60d38ef7251760694d8bb2a29424e Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Thu, 7 Dec 2017 13:36:35 +0200 Subject: =?UTF-8?q?[build]=20linux-clang39-debug=20=E2=86=92=20linux-clang?= =?UTF-8?q?-3.8-libcxx-debug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 8 ++++++-- 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 -- cgit v1.2.1