Title: [185823] trunk
- Revision
- 185823
- Author
- zandober...@gmail.com
- Date
- 2015-06-22 04:55:45 -0700 (Mon, 22 Jun 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (185822 => 185823)
--- trunk/ChangeLog 2015-06-22 10:03:32 UTC (rev 185822)
+++ trunk/ChangeLog 2015-06-22 11:55:45 UTC (rev 185823)
@@ -1,3 +1,15 @@
+2015-06-22 Zan Dobersek <zdober...@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.chime...@gmail.com>
libwebkit2gtk fails to link without opengl
Modified: trunk/Source/PlatformGTK.cmake (185822 => 185823)
--- trunk/Source/PlatformGTK.cmake 2015-06-22 10:03:32 UTC (rev 185822)
+++ trunk/Source/PlatformGTK.cmake 2015-06-22 11:55:45 UTC (rev 185823)
@@ -34,7 +34,7 @@
add_gtkdoc_generator("docs-build.stamp" "")
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")
# Add a default build step which check that documentation does not have any warnings
Modified: trunk/Source/cmake/OptionsCommon.cmake (185822 => 185823)
--- trunk/Source/cmake/OptionsCommon.cmake 2015-06-22 10:03:32 UTC (rev 185822)
+++ trunk/Source/cmake/OptionsCommon.cmake 2015-06-22 11:55:45 UTC (rev 185823)
@@ -104,7 +104,9 @@
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-Wl,--no-keep-memory ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
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 ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
