Title: [257433] releases/WebKitGTK/webkit-2.28
- Revision
- 257433
- Author
- [email protected]
- Date
- 2020-02-26 02:56:12 -0800 (Wed, 26 Feb 2020)
Log Message
Merge r256917 - [GTK][WPE] Set ccache as compiler launcher, add opt-in sccache support
https://bugs.webkit.org/show_bug.cgi?id=207838
Reviewed by Carlos Alberto Lopez Perez.
This change allows for more granular control over the compiler
launcher configuration. The build host should no longer need to
set ccache symbolic links. Additionally optional support for
sccache is added, enabled when the WEBKIT_USE_SCCACHE environment
variable is set to YES.
* Source/cmake/WebKitCCache.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/ChangeLog (257432 => 257433)
--- releases/WebKitGTK/webkit-2.28/ChangeLog 2020-02-26 10:56:09 UTC (rev 257432)
+++ releases/WebKitGTK/webkit-2.28/ChangeLog 2020-02-26 10:56:12 UTC (rev 257433)
@@ -1,3 +1,18 @@
+2020-02-19 Philippe Normand <[email protected]>
+
+ [GTK][WPE] Set ccache as compiler launcher, add opt-in sccache support
+ https://bugs.webkit.org/show_bug.cgi?id=207838
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ This change allows for more granular control over the compiler
+ launcher configuration. The build host should no longer need to
+ set ccache symbolic links. Additionally optional support for
+ sccache is added, enabled when the WEBKIT_USE_SCCACHE environment
+ variable is set to YES.
+
+ * Source/cmake/WebKitCCache.cmake:
+
2020-02-10 Michael Catanzaro <[email protected]>
[CMake] Prepend -Wno-noexcept-type only to global CXX flags
Modified: releases/WebKitGTK/webkit-2.28/Source/cmake/WebKitCCache.cmake (257432 => 257433)
--- releases/WebKitGTK/webkit-2.28/Source/cmake/WebKitCCache.cmake 2020-02-26 10:56:09 UTC (rev 257432)
+++ releases/WebKitGTK/webkit-2.28/Source/cmake/WebKitCCache.cmake 2020-02-26 10:56:12 UTC (rev 257433)
@@ -1,8 +1,20 @@
-# Enable ccache by default for the Mac port, if installed.
-# Setting WK_USE_CCACHE=NO in your environment will disable it.
-if (PORT STREQUAL "Mac" AND NOT "$ENV{WK_USE_CCACHE}" STREQUAL "NO")
+# Enable ccache by default, if installed. Setting WK_USE_CCACHE=NO in your
+# environment will disable it.
+if (NOT "$ENV{WK_USE_CCACHE}" STREQUAL "NO")
find_program(CCACHE_FOUND ccache)
if (CCACHE_FOUND)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CMAKE_SOURCE_DIR}/Tools/ccache/ccache-wrapper)
+ if (PORT STREQUAL "Mac")
+ set(CCACHE ${CMAKE_SOURCE_DIR}/Tools/ccache/ccache-wrapper)
+ else ()
+ set(CCACHE ${CCACHE_FOUND})
+ endif ()
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${CCACHE})
endif ()
endif ()
+
+if ("$ENV{WEBKIT_USE_SCCACHE}" STREQUAL "YES")
+ find_program(SCCACHE_FOUND sccache)
+ if (SCCACHE_FOUND)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ${SCCACHE_FOUND})
+ endif ()
+endif ()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
