Skip to content

T
titan
Commit c6b93a63 authored by yiwu-arbug's avatar yiwu-arbug Committed by pingcap-github-bot
Browse files
Options

Revert "Relax warnings as errors so we can build on Clang 11 (#90)" (#102)

parent d4cb98cb
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 7 deletions
.travis.yml
View file @ c6b93a63
...@@ -6,7 +6,7 @@ os: ...@@ -6,7 +6,7 @@ os:
- linux - linux
- osx - osx
compiler: clang compiler: clang
osx_image: xcode10.2 osx_image: xcode11.2
addons: addons:
apt: apt:
......
cmake/rocksdb_flags.cmake
View file @ c6b93a63
...@@ -143,13 +143,8 @@ option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON) ...@@ -143,13 +143,8 @@ option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON)
if(FAIL_ON_WARNINGS) if(FAIL_ON_WARNINGS)
if(MSVC) if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
else() else() # assume GCC
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=shadow -Wno-error=defaulted-function-deleted")
endif()
endif()
endif() endif()
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment