[build] use newer compiler versions for some buildsupstream/upgrade-compilers

7 files changed, 30 insertions, 54 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0de9774e1..fb00412256 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,6 +100,7 @@ set(CMAKE_C_FLAGS_SANITIZE "${CMAKE_C_FLAGS_SANITIZE} -O1 -g -fno-omit-frame-poi
 
 if(CMAKE_CXX_COMPILER_ID MATCHES ".*Clang")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unknown-warning-option")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=unknown-warning-option")
 elseif(CMAKE_COMPILER_IS_GNUCXX)
     # https://svn.boost.org/trac/boost/ticket/9240
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals")
diff --git a/bin/offline.cpp b/bin/offline.cpp
index 0d0fe57281..398f8427ee 100644
--- a/bin/offline.cpp
+++ b/bin/offline.cpp
@@ -137,7 +137,7 @@ int main(int argc, char *argv[]) {
                 std::string json = readFile(geometryValue.Get());
                 auto geometry = parseGeometry(json);
                 return OfflineRegionDefinition{ OfflineGeometryRegionDefinition(style, geometry, minZoom, maxZoom, pixelRatio) };
-            } catch(std::runtime_error e) {
+            } catch(const std::runtime_error& e) {
                 std::cerr << "Could not parse geojson file " << geometryValue.Get() << ": " << e.what() << std::endl;
                 exit(1);
             }
diff --git a/circle.yml b/circle.yml
index 027e154592..87bca8559c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -22,7 +22,7 @@ workflows:
           filters:
             tags:
               only: /node-.*/
-      - node-gcc6-debug:
+      - node-gcc8-debug:
           filters:
             tags:
               only: /node-.*/
@@ -32,9 +32,8 @@ workflows:
               only: /node-.*/
       - linux-clang-38-libcxx-debug:
           name: linux-clang-3.8-libcxx-debug
-      - linux-clang4-sanitize-address
-      - linux-clang4-sanitize-undefined
-      - linux-clang4-sanitize-thread
+      - linux-clang-7-sanitize-address-undefined
+      - linux-clang-7-sanitize-thread
       - linux-gcc49-debug:
           name: linux-gcc4.9-debug
       - linux-gcc5-debug-coverage
@@ -400,6 +399,14 @@ commands:
           xvfb-run --server-args="-screen 0 1024x768x24" \
             make run-test
 
+  run-unit-tests-sanitized:
+    steps:
+    - run:
+        name: Run tests
+        command: |
+          xvfb-run --server-args="-screen 0 1024x768x24" make run-test 2> >(tee sanitizer 1>&2)
+          # Unfortunately, Google Test eats the status code, so we'll have to check the output.
+          [ -z "$(sed -n '/^SUMMARY: .*Sanitizer:/p' sanitizer)" ]
 
   publish-node-package:
     steps:
@@ -450,7 +457,7 @@ commands:
 jobs:
   nitpick:
     docker:
-      - image: mbgl/linux-clang-4:d121f629f7
+      - image: mbgl/linux-clang-7:a5a3c52107
     working_directory: /src
     environment:
       LIBSYSCONFCPUS: 4
@@ -485,7 +492,7 @@ jobs:
 # ------------------------------------------------------------------------------
   clang-tidy:
     docker:
-      - image: mbgl/linux-clang-3.9:2077f965ed
+      - image: mbgl/linux-clang-7:a5a3c52107
     working_directory: /src
     environment:
       LIBSYSCONFCPUS: 4
@@ -656,9 +663,9 @@ jobs:
       - upload-render-tests
 
 # ------------------------------------------------------------------------------
-  node-gcc6-debug:
+  node-gcc8-debug:
     docker:
-      - image: mbgl/linux-gcc-6:d461f83b52
+      - image: mbgl/linux-gcc-8:d2b1553d2f
     resource_class: large
     working_directory: /src
     environment:
@@ -710,9 +717,9 @@ jobs:
       - save-dependencies
 
 # ------------------------------------------------------------------------------
-  linux-clang4-sanitize-address:
+  linux-clang-7-sanitize-address-undefined:
     docker:
-      - image: mbgl/linux-clang-4:d121f629f7
+      - image: mbgl/linux-clang-7:a5a3c52107
     working_directory: /src
     environment:
       LIBSYSCONFCPUS: 4
@@ -720,51 +727,21 @@ jobs:
       BUILDTYPE: Sanitize
       WITH_EGL: 1
       GDB: '' # Do not run with GDB
-      CXXFLAGS: -fsanitize=address
-      LDFLAGS: -fsanitize=address
+      CXXFLAGS: -fsanitize=address -fsanitize=undefined
+      LDFLAGS: -fsanitize=address -fsanitize=undefined
       ASAN_OPTIONS: detect_leaks=0:color=always:print_summary=1
-    steps:
-      - install-dependencies
-      - setup-llvm-symbolizer
-      - build-test
-      - save-dependencies
-      - run:
-          name: Run tests
-          command: |
-            xvfb-run --server-args="-screen 0 1024x768x24" make run-test 2> >(tee sanitizer 1>&2)
-            # Unfortunately, Google Test eats the status code, so we'll have to check the output.
-            [ -z "$(sed -n '/^SUMMARY: AddressSanitizer:/p' sanitizer)" ]
-
-# ------------------------------------------------------------------------------
-  linux-clang4-sanitize-undefined:
-    docker:
-      - image: mbgl/linux-clang-4:d121f629f7
-    working_directory: /src
-    environment:
-      LIBSYSCONFCPUS: 4
-      JOBS: 4
-      BUILDTYPE: Sanitize
-      WITH_EGL: 1
-      GDB: '' # Do not run with GDB
-      CXXFLAGS: -fsanitize=undefined
-      LDFLAGS: -fsanitize=undefined
       UBSAN_OPTIONS: print_stacktrace=1:color=always:print_summary=1
     steps:
       - install-dependencies
       - setup-llvm-symbolizer
       - build-test
       - save-dependencies
-      - run:
-          name: Run tests
-          command: |
-            xvfb-run --server-args="-screen 0 1024x768x24" make run-test 2> >(tee sanitizer 1>&2)
-            # Unfortunately, Google Test eats the status code, so we'll have to check the output.
-            [ -z "$(sed -n '/^SUMMARY: UndefinedBehaviorSanitizer:/p' sanitizer)" ]
+      - run-unit-tests-sanitized
 
 # ------------------------------------------------------------------------------
-  linux-clang4-sanitize-thread:
+  linux-clang-7-sanitize-thread:
     docker:
-      - image: mbgl/linux-clang-4:d121f629f7
+      - image: mbgl/linux-clang-7:a5a3c52107
     working_directory: /src
     environment:
       LIBSYSCONFCPUS: 4
@@ -780,12 +757,7 @@ jobs:
       - setup-llvm-symbolizer
       - build-test
       - save-dependencies
-      - run:
-          name: Run tests
-          command: |
-            xvfb-run --server-args="-screen 0 1024x768x24" make run-test 2> >(tee sanitizer 1>&2)
-            # Unfortunately, Google Test eats the status code, so we'll have to check the output.
-            [ -z "$(sed -n '/^SUMMARY: ThreadSanitizer:/p' sanitizer)" ]
+      - run-unit-tests-sanitized
 
 # ------------------------------------------------------------------------------
   linux-gcc49-debug:
diff --git a/cmake/mbgl.cmake b/cmake/mbgl.cmake
index 97517fb9c5..8eb065dd09 100644
--- a/cmake/mbgl.cmake
+++ b/cmake/mbgl.cmake
@@ -155,7 +155,7 @@ function(add_vendor_target NAME TYPE)
     foreach(FILE IN LISTS FILES)
         target_sources(${NAME} ${SOURCE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/${FILE}")
     endforeach()
-    target_include_directories(${NAME} ${INCLUDE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/include")
+    target_include_directories(${NAME} SYSTEM ${INCLUDE_TYPE} "${CMAKE_CURRENT_SOURCE_DIR}/vendor/${NAME}/include")
     create_source_groups(${NAME})
 endfunction()
 
diff --git a/cmake/sqlite.cmake b/cmake/sqlite.cmake
index b099210c85..fd2d98d3e2 100644
--- a/cmake/sqlite.cmake
+++ b/cmake/sqlite.cmake
@@ -34,4 +34,5 @@ target_compile_definitions(sqlite
 target_compile_options(sqlite
     PRIVATE "-Wno-int-conversion"
     PRIVATE "-Wno-implicit-fallthrough"
+    PRIVATE "-Wno-cast-function-type"
 )
diff --git a/cmake/test.cmake b/cmake/test.cmake
index 053ba92d76..4f7933ade2 100644
--- a/cmake/test.cmake
+++ b/cmake/test.cmake
@@ -8,6 +8,8 @@ else()
     add_executable(mbgl-test ${MBGL_TEST_FILES})
 endif()
 
+# GCC 8+ trips over GTest's way of defining Test functions
+target_compile_options(mbgl-test PRIVATE -Wno-shadow)
 
 if(NOT WITH_NODEJS)
     target_compile_definitions(mbgl-test PRIVATE "-DTEST_HAS_SERVER=0")
diff --git a/package.json b/package.json
index ce8262b376..aee394c9a4 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "license": "BSD-2-Clause",
   "dependencies": {
-    "@mapbox/cmake-node-module": "^1.1.0",
+    "@mapbox/cmake-node-module": "^1.2.0",
     "node-pre-gyp": "^0.10.2",
     "npm-run-all": "^4.0.2"
   },