Changeset 268475 in webkit

Timestamp:

Oct 14, 2020 11:03:36 AM (4 years ago)

Author:

Keith Rollin

Message:

'make debug' fails on the repository root if ccache is installed on mac after r262147
​https://bugs.webkit.org/show_bug.cgi?id=212469
<rdar://problem/70278783>

Reviewed by David Kilzer.

ccache is frequently installed in /usr/local/bin. However, when
running under XCBuild, $PATH does not include /usr/local/bin. This
leaves in a situation where the check for the existence of ccache in
Makefile.shared succeeds, but the use of ccache in ccache-wrapper
fails. To address this, look for ccache in a few well-known places
rather than just relying on $PATH. If it still can't be found, fall
back to compiling normally without ccache.

• ccache/ccache-wrapper:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• ccache/ccache-wrapper (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-14  Keith Rollin  <krollin@apple.com>
+
+        'make debug' fails on the repository root if ccache is installed on mac after r262147
+        https://bugs.webkit.org/show_bug.cgi?id=212469
+        <rdar://problem/70278783>
+
+        Reviewed by David Kilzer.
+
+        ccache is frequently installed in /usr/local/bin. However, when
+        running under XCBuild, $PATH does not include /usr/local/bin. This
+        leaves in a situation where the check for the existence of ccache in
+        Makefile.shared succeeds, but the use of ccache in ccache-wrapper
+        fails. To address this, look for ccache in a few well-known places
+        rather than just relying on $PATH. If it still can't be found, fall
+        back to compiling normally without ccache.
+
+        * ccache/ccache-wrapper:
+
 2020-10-14  Sam Weinig  <weinig@apple.com>
 

trunk/Tools/ccache/ccache-wrapper

@@ -24 +24 @@
 # THE POSSIBILITY OF SUCH DAMAGE.
 
-CCACHE_SLOPPINESS="pch_defines,time_macros" ccache "$@"
+try_one()
+{
+    [[ -x "$1" && ! -d "$1" ]] && { CCACHE="$1"; return 0; }
+    return 1
+}
+
+try()
+{
+    [[ -n "${CCACHE}" ]] && return 0
+    try_one "$1" || \
+    try_one "$1/ccache" || \
+    try_one "$1/bin/ccache"
+}
+
+try $(which ccache &> /dev/null)
+try /usr/local
+try /opt/brew
+try "${HOMEBREW_TEMP}/../brew"
+try "${HOMEBREW_TEMP}/../../brew"
+
+if [[ -n "${CCACHE}" ]]; then
+    CCACHE_SLOPPINESS="pch_defines,time_macros" "${CCACHE}" "$@"
+else
+    "$@"
+fi