Title: [289611] trunk
Revision
289611
Author
[email protected]
Date
2022-02-11 01:16:53 -0800 (Fri, 11 Feb 2022)

Log Message

[CMake] Use ld.lld by default for development builds where available
https://bugs.webkit.org/show_bug.cgi?id=235979

Reviewed by Michael Catanzaro.

* Source/cmake/OptionsCommon.cmake: Enable USE_LD_LLD by default for developers builds
when ld.lld is available. While at it, improve the match on LD_VERSION to be more robust.

Modified Paths

Diff

Modified: trunk/ChangeLog (289610 => 289611)


--- trunk/ChangeLog	2022-02-11 08:44:23 UTC (rev 289610)
+++ trunk/ChangeLog	2022-02-11 09:16:53 UTC (rev 289611)
@@ -1,3 +1,13 @@
+2022-02-11  Adrian Perez de Castro  <[email protected]>
+
+        [CMake] Use ld.lld by default for development builds where available
+        https://bugs.webkit.org/show_bug.cgi?id=235979
+
+        Reviewed by Michael Catanzaro.
+
+        * Source/cmake/OptionsCommon.cmake: Enable USE_LD_LLD by default for developers builds
+        when ld.lld is available. While at it, improve the match on LD_VERSION to be more robust.
+
 2022-02-10  Filip Pizlo  <[email protected]>
 
         Unreviewed, add an alternate email address.

Modified: trunk/Source/cmake/OptionsCommon.cmake (289610 => 289611)


--- trunk/Source/cmake/OptionsCommon.cmake	2022-02-11 08:44:23 UTC (rev 289610)
+++ trunk/Source/cmake/OptionsCommon.cmake	2022-02-11 09:16:53 UTC (rev 289611)
@@ -21,12 +21,17 @@
     CHECK_CXX_SOURCE_COMPILES("${ARM_THUMB2_TEST_SOURCE}" ARM_THUMB2_DETECTED)
 endif ()
 
-# Use ld.lld when building with LTO
+# Use ld.lld when building with LTO, or for debug builds, if available.
+# FIXME: With CMake 3.22+ full conditional syntax can be used in
+#        cmake_dependent_option()
+if (LTO_MODE OR DEVELOPER_MODE)
+    set(TRY_USE_LD_LLD ON)
+endif ()
 CMAKE_DEPENDENT_OPTION(USE_LD_LLD "Use LLD linker" ON
-                       "LTO_MODE;NOT WIN32" OFF)
+                       "TRY_USE_LD_LLD;NOT WIN32" OFF)
 if (USE_LD_LLD)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-    if ("${LD_VERSION}" MATCHES "LLD")
+    if (LD_VERSION MATCHES "^LLD ")
         string(APPEND CMAKE_EXE_LINKER_FLAGS " -fuse-ld=lld")
         string(APPEND CMAKE_SHARED_LINKER_FLAGS " -fuse-ld=lld")
         string(APPEND CMAKE_MODULE_LINKER_FLAGS " -fuse-ld=lld")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to