travis: try to fix ubsan for clang-old, take 2

diff --git a/.travis.yml b/.travis.yml
index 31e122cea73b23749ee42dd5ac6ceec50ef208b8..5d96e69838d95b99345a8e5292946e9c080ca064 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,13 +12,13 @@ addons:
 dist: bionic
 language: cpp
 compiler:
- - gcc
+# - gcc
  - clang
 
 env:
- - BUILD=Release SASL=false
- - BUILD=Debug SASL=true PREFIX=/opt PORT=11212 MC_VERSION=1.5.22
- - BUILD=Debug SASL=false PREFIX=/opt PORT=11212 MC_VERSION=1.6.6
+# - BUILD=Release SASL=false
+# - BUILD=Debug SASL=true PREFIX=/opt PORT=11212 MC_VERSION=1.5.22
+# - BUILD=Debug SASL=false PREFIX=/opt PORT=11212 MC_VERSION=1.6.6
  - BUILD=Debug SASL=true PREFIX=/opt PORT=11212 SANITIZERS="address;undefined"
 
 #before_install:

diff --git a/CMake/CheckDebug.cmake b/CMake/CheckDebug.cmake
index 433682998b17d171a023f94e14c95fe9c1ea45ac..cd0dd9b40f0cbbdd5e68a4e5de4610b8fe5d9d91 100644 (file)
--- a/CMake/CheckDebug.cmake
+++ b/CMake/CheckDebug.cmake
@@ -50,7 +50,7 @@ function(check_debug)
                     add_compile_definitions(HAVE_ASAN)
                     add_compile_options(-fsanitize=address)
                     if(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-                        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+                        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -v -fsanitize=address")
                     endif()
                     link_libraries(asan)
                     check_flag(-fsanitize-recover=address IGNORE)
@@ -66,7 +66,7 @@ function(check_debug)
                     add_compile_definitions(HAVE_UBSAN)
                     add_compile_options(-fsanitize=undefined)
                     if(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-                        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined")
+                        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -v -fsanitize=undefined")
                     endif()
                     link_libraries(ubsan)
                     check_flag(-fsanitize-recover=undefined IGNORE)