580175 - make ccache option more flexible

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Takanori MATSUURA]

User-Agent:       Mozilla/5.0 (X11; Linux x86_64; rv:2.0b2pre) Gecko/20100720 Fedora/4.0b2pre-0.b2pre.2010072011.fc13 Minefield/4.0b2pre Firefox/3.6.6
Build Identifier: 

Add to detect ccache automatically if --with-ccache is defined.

Reproducible: Always

Comment 1

[Takanori MATSUURA]

Attachment: To solve this

Comment 2

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 458565 [details] [diff] [review]
To solve this

This will make --with-ccache work, but it will break --with-ccache=path/to/ccache.  Fix that and repost please.

Comment 3

[Takanori MATSUURA]

Attachment: To solve this v2.

Sorry for my mistake.

This should be work.

Comment 4

[Takanori MATSUURA]

Attachment: To solve this v3.

Fix to work without "--with-ccache".

Comment 5

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Much better, just two nits with the current version.

1) If I specify --with-ccache but ccache is not in my path, this will not give an error.  To fix this you probably need to use a temporary to store the value of ccache from MOZ_ARG_WITH_STRING and then set CCACHE appropriately.

2) Please use MOZ_PATH_PROG instead of AC_PATH_PROG.  MOZ_PATH_PROG is our own version of AC_PATH_PROG that has some extra goodness to work in our windows build environment.

Comment 6

[Takanori MATSUURA]

Attachment: To solve this v4.

Test result:

1.system doesn't have ccache
without "--with-ccache"
  (check skipped)

--with-ccache
  checking for ccache... :
  configure: error: ccache not found in $PATH

--with-ccache=
  configure: error: --with-ccache is set with a blank value

--with-ccache=/not_exist/bin/ccache
  checking for ccache... /not_exist/bin/ccache
  configure: error: /not_exist/bin/ccache not found


2. system have ccache in /usr/bin/ccache
without "--with-ccache"
  (check skipped)

--with-ccache
  checking for ccache... /usr/bin/ccache

--with-ccache=
  configure: error: --with-ccache is set with a blank value

--with-ccache=/not_exist/bin/ccache
  checking for ccache... /not_exist/bin/ccache
  configure: error: /not_exist/bin/ccache not found

--with-ccache=/exist/bin/ccache
  checking for ccache... /exist/bin/ccache

Comment 7

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 458907 [details] [diff] [review]
To solve this v4.

>diff --git a/configure.in b/configure.in
>--- a/configure.in
>+++ b/configure.in
>@@ -7402,13 +7402,23 @@ dnl ====================================
> dnl = Enable compiling with ccache
> dnl ======================================================
> MOZ_ARG_WITH_STRING(ccache,
>-[  --with-ccache=path/to/ccache
>+[  --with-ccache[=path/to/ccache]
>                           Enable compiling with ccache],
>-    CCACHE_PATH=$withval,)
>-
>-if test -n "$CCACHE_PATH"; then
>-  CC="$CCACHE_PATH $CC"
>-  CXX="$CCACHE_PATH $CXX"
>+    CCACHE_PATH=$withval, CCACHE_PATH="no")

Lets say I pass --with-ccache=/exists/bin/ccache but ccache isn't in the path

>+
>+if test -z "$CCACHE_PATH"; then
>+    AC_MSG_ERROR([--with-ccache is set with a blank value])

This test passes.

>+elif test "$CCACHE_PATH" != "no"; then
>+    CCACHE="$CCACHE_PATH"

We set CCACHE to /exists/bin/ccache

>+    MOZ_PATH_PROG(CCACHE, ccache, :)

We clobber CCACHE here with :

>+    if test -z "$CCACHE" -o "$CCACHE" = ":"; then
>+        AC_MSG_ERROR([ccache not found in \$PATH])
>+    elif test -x "$CCACHE"; then
>+        CC="$CCACHE $CC"
>+        CXX="$CCACHE $CXX"
>+    else
>+        AC_MSG_ERROR([$CCACHE not found])
>+    fi

You should avoid setting CCACHE to CCACHE_PATH until after MOZ_PATH_PROGS and guard on the result of MOZ_PATH_PROG being ':' before you do that (in addition to erroring out if MOZ_PATH_PROGS returns ':' and CCACHE_PATH is yes.

Isn't autoconf fun? :-)

Comment 8

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 458907 [details] [diff] [review]
To solve this v4.

So yeah, r- until we fix that, but we're almost there!

Comment 9

[Takanori MATSUURA]

Attachment: To solve this v5.

"--with-ccache=" is treated as "--with-ccache" now.

If I set "--with-ccache=/usr/bin/ccache", configure script returns:
checking for /usr/bin/ccache... no
checking for ccache... /usr/bin/ccache

I cannot understand it.

Comment 10

[Takanori MATSUURA]

Attachment: This does not work

In case of "--with-ccache=/usr/bin/ccache", configure script returns
checking for /usr/bin/ccache... no
checking for ccache... /usr/bin/ccache

Comment 11

[Takanori MATSUURA]

Attachment: To solve this v6

Comment 12

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

Comment on attachment 460205 [details] [diff] [review]
To solve this v6

I think this should do it.  r=me.

We can take this for 2.0, it's a simple build system change that's backwards compatible.

Comment 13

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

http://hg.mozilla.org/mozilla-central/rev/55002e95d9e6

Comment 14

[Brad Lassey [:blassey] (use needinfo?)]

just to note, this breaks the ability to use a specific version of ccache that's in your path with something like --with-ccache=ccache2.4.1.

Comment 15

[Takanori MATSUURA]

(In reply to comment #14)
> just to note, this breaks the ability to use a specific version of ccache
> that's in your path with something like --with-ccache=ccache2.4.1.

I've not tested ccache as another name such as ccache2.4.1.

I suppose binary name of ccache is defined as MYNAME in ccache.h in the ccache source. If you want to use another name for ccache binary, you will need to modify the definition of MYNAME. It's the issue of compiling ccache.

Please make sure to run
$ ccache2.4.1
returns help text, not 
ccache: FATAL: Could not find compiler "ccache2.4.1" in PATH

If you got FATAL message, please try to redefine MYNAME during compiling ccache.
If you got help text successfully, could you try --with-ccache=/foo/bin/ccache2.4.1 ?