Changeset 223818 in webkit

Timestamp:

Oct 21, 2017 2:42:51 PM (7 years ago)

Author:

timothy_horton@apple.com

Message:

Turn on ccache for Mac cmake builds by default
​https://bugs.webkit.org/show_bug.cgi?id=177059

Reviewed by Sam Weinig.

.:

• Source/cmake/WebKitCCache.cmake: Added.
• Source/cmake/WebKitCommon.cmake:

Turn on ccache for Mac CMake builds (Makefile and Ninja generators only)
if it's installed, making use of CMake's ability to wrap the compiler invocation.

Tools:

• ccache/ccache-clang:
• ccache/ccache-wrapper: Added.

Add a pass-through ccache wrapper to be used with CMake, in addition
to the existing faux-clang wrappers.

• Scripts/build-webkit:

Add --use-ccache and --no-use-ccache option, which will define
WK_USE_CCACHE to YES or NO, respectively, which the underlying
build systems respect. We do not define WK_USE_CCACHE if the option
is not specified, because the underlying build systems have different
default values.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitCCache.cmake (added)
• Source/cmake/WebKitCommon.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (4 diffs)
• Tools/ccache/ccache-clang (modified) (1 diff)
• Tools/ccache/ccache-wrapper (copied) (copied from trunk/Tools/ccache/ccache-clang) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2017-10-21  Tim Horton  <timothy_horton@apple.com>
+
+        Turn on ccache for Mac cmake builds by default
+        https://bugs.webkit.org/show_bug.cgi?id=177059
+
+        Reviewed by Sam Weinig.
+
+        * Source/cmake/WebKitCCache.cmake: Added.
+        * Source/cmake/WebKitCommon.cmake:
+        Turn on ccache for Mac CMake builds (Makefile and Ninja generators only)
+        if it's installed, making use of CMake's ability to wrap the compiler invocation.
+
 2017-10-20  Antoine Quint  <graouts@apple.com>
 

trunk/Source/cmake/WebKitCommon.cmake

@@ -53 +53 @@
     include(WebKitMacros)
     include(WebKitFS)
+    include(WebKitCCache)
     include(WebKitCompilerFlags)
     include(WebKitFeatures)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-21  Tim Horton  <timothy_horton@apple.com>
+
+        Turn on ccache for Mac cmake builds by default
+        https://bugs.webkit.org/show_bug.cgi?id=177059
+
+        Reviewed by Sam Weinig.
+
+        * ccache/ccache-clang:
+        * ccache/ccache-wrapper: Added.
+        Add a pass-through ccache wrapper to be used with CMake, in addition
+        to the existing faux-clang wrappers.
+
+        * Scripts/build-webkit:
+        Add --use-ccache and --no-use-ccache option, which will define
+        WK_USE_CCACHE to YES or NO, respectively, which the underlying
+        build systems respect. We do not define WK_USE_CCACHE if the option
+        is not specified, because the underlying build systems have different
+        default values.
+
 2017-10-20  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -67 +67 @@
 my $archs32bit = 0;
 my $skipLibraryUpdate = 0;
+my $useCCache = -1;
 
 my @features = getFeatureOptionList();
@@ -121 +122 @@
   --skip-library-update             Skip the check to see if windows libraries are up to date
 
+  --[no-]use-ccache                 Enable (or disable) CCache, if available
+
 EOF
 
@@ -137 +140 @@
     'analyze' => \$shouldRunStaticAnalyzer,
     'default-cmake-features' => \$defaultCMakeFeatures,
-    'skip-library-update' => \$skipLibraryUpdate
+    'skip-library-update' => \$skipLibraryUpdate,
+    'use-ccache!' => \$useCCache,
 );
 
@@ -155 +159 @@
 
 $ENV{'VERBOSE'} = 1 if $verbose;
+
+if ($useCCache == 1) {
+    $ENV{'WK_USE_CCACHE'} = "YES";
+} elsif ($useCCache == 0) {
+    $ENV{'WK_USE_CCACHE'} = "NO";
+}
 
 checkRequiredSystemConfig();

trunk/Tools/ccache/ccache-clang

@@ -35 +35 @@
     position=$(($position + 1))
 done
-CCACHE_SLOPPINESS="pch_defines,time_macros" ccache $(xcrun -f -sdk "$sdk" "${_XCRUN_TOOL:-clang}") "$@"
+$(dirname "$0")/ccache-wrapper $(xcrun -f -sdk "$sdk" "${_XCRUN_TOOL:-clang}") "$@"

trunk/Tools/ccache/ccache-wrapper

@@ -24 +24 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-position=1
-while [[ $position -le $# ]]; do
-    case "${!position}" in
-    -isysroot)
-        position=$(($position + 1))
-        sdk="${!position}"
-        break
-        ;;
-    esac
-    position=$(($position + 1))
-done
-CCACHE_SLOPPINESS="pch_defines,time_macros" ccache $(xcrun -f -sdk "$sdk" "${_XCRUN_TOOL:-clang}") "$@"
+CCACHE_SLOPPINESS="pch_defines,time_macros" ccache "$@"