Changeset 185823 in webkit

Timestamp:

Jun 22, 2015, 4:55:45 AM (11 years ago)

Author:

zandobersek@gmail.com

Message:

[CMake] Add support for building with various sanitizer tools
​https://bugs.webkit.org/show_bug.cgi?id=131941

Reviewed by Martin Robinson.

• Source/PlatformGTK.cmake: Don't generate any documentation

when compiling with sanitizers enabled.

• Source/cmake/OptionsCommon.cmake: Allow linking with

undefined symbols when compiling with sanitizers enabled.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/PlatformGTK.cmake (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2015-06-22  Zan Dobersek  <zdobersek@igalia.com>
+
+        [CMake] Add support for building with various sanitizer tools
+        https://bugs.webkit.org/show_bug.cgi?id=131941
+
+        Reviewed by Martin Robinson.
+
+        * Source/PlatformGTK.cmake: Don't generate any documentation
+        when compiling with sanitizers enabled.
+        * Source/cmake/OptionsCommon.cmake: Allow linking with
+        undefined symbols when compiling with sanitizers enabled.
+
 2015-06-21  Philip Chimento  <philip.chimento@gmail.com>
 

trunk/Source/PlatformGTK.cmake

@@ -35 +35 @@
 if (ENABLE_GTKDOC)
     add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
-else ()
+elseif (NOT ENABLED_COMPILER_SANITIZERS)
     add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -105 +105 @@
 endif ()
 
-if (UNIX AND NOT APPLE)
+string(REGEX MATCHALL "-fsanitize=[^ ]*" ENABLED_COMPILER_SANITIZERS ${CMAKE_CXX_FLAGS})
+
+if (UNIX AND NOT APPLE AND NOT ENABLED_COMPILER_SANITIZERS)
     set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
 endif ()