- update version to 2.0

- added CCACHE_RECACHE option (suggestion from Ismael Orenstein <ismore@ieg.com.br>)

diff --git a/ccache.1 b/ccache.1
index 00b9c6b3cb233b9f658dcae1910917752efe4305..aaef0f44f531059df6b1921e2f1b49ddf5d3215d 100644 (file)
--- a/ccache.1
+++ b/ccache.1
@@ -169,6 +169,11 @@ instead\&. The main reason for setting this option is to avoid the
 update of the modification time on object files that are the result of
 the same compilation in a different directory\&.
 .IP 
+.IP "\fBCCACHE_RECACHE\fP" 
+This forces ccache to not use any cached
+results, even if it finds them\&. New results are still cached, but
+existing cache entries are ignored\&.
+.IP 
 .IP "\fBCCACHE_UNIFY\fP" 
 If you set the environment variable CCACHE_UNIFY
 then ccache will use the C/C++ unifier when hashing the pre-processor

diff --git a/ccache.c b/ccache.c
index 542b72efd49645cbf43da6ca61be9ab7589ad0a0..312da9235d6207621baf403c175a5f22c5e9ed30 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -384,6 +384,14 @@ static void from_cache(int first)
                return;
        }
 
+       /* the user might be disabling cache hits */
+       if (first && getenv("CCACHE_RECACHE")) {
+               close(fd_stderr);
+               unlink(stderr_file);
+               free(stderr_file);
+               return;
+       }
+
        utime(stderr_file, NULL);
 
        if (strcmp(output_file, "/dev/null") == 0) {
@@ -630,7 +638,7 @@ static void process_args(int argc, char **argv)
                {
                        const char *opts[] = {"-I", "-Iinclude", "-imacros", "-iprefix",
                                              "-iwithprefix", "-iwithprefixbefore",
-                                             "-L", "-D", "-U", "-x", "-MF", "-MT",
+                                             "-L", "-D", "-U", "-x", "-MF", 
                                              "-MT", "-MQ", "-isystem", "-aux-info",
                                              "--param", "-A", "-Xlinker", "-u",
                                              NULL};

diff --git a/ccache.h b/ccache.h
index 5a4d07967e3eae949e5d08fcfacd562679f29fac..bcf3fddf266f137a92f222c950880aa5ef569183 100644 (file)
--- a/ccache.h
+++ b/ccache.h
@@ -1,4 +1,4 @@
-#define CCACHE_VERSION "1.9"
+#define CCACHE_VERSION "2.0"
 
 #include "config.h"
 

diff --git a/ccache.yo b/ccache.yo
index 87461df8b5505fd53e0914e7c46ae0081f332cff..bb383d72c747c8d5e20740fb90fe8be563de93b3 100644 (file)
--- a/ccache.yo
+++ b/ccache.yo
@@ -144,6 +144,10 @@ instead. The main reason for setting this option is to avoid the
 update of the modification time on object files that are the result of
 the same compilation in a different directory.
 
+dit(bf(CCACHE_RECACHE)) This forces ccache to not use any cached
+results, even if it finds them. New results are still cached, but
+existing cache entries are ignored.
+
 dit(bf(CCACHE_UNIFY)) If you set the environment variable CCACHE_UNIFY
 then ccache will use the C/C++ unifier when hashing the pre-processor
 output if -g is not used in the compile. The unifier is slower than a

diff --git a/web/ccache-man.html b/web/ccache-man.html
index 1c2a938764af7b2f63a7cb6271fc5270ca1d795d..007fe71c66bd6bc592b475e7f85dcb1f8a6f5f37 100644 (file)
--- a/web/ccache-man.html
+++ b/web/ccache-man.html
@@ -137,6 +137,9 @@ directory when creating the compiler output and will do a file copy
 instead. The main reason for setting this option is to avoid the
 update of the modification time on object files that are the result of
 the same compilation in a different directory.
+<p><p></p><dt><strong><strong>CCACHE_RECACHE</strong></strong><dd> This forces ccache to not use any cached
+results, even if it finds them. New results are still cached, but
+existing cache entries are ignored.
 <p><p></p><dt><strong><strong>CCACHE_UNIFY</strong></strong><dd> If you set the environment variable CCACHE_UNIFY
 then ccache will use the C/C++ unifier when hashing the pre-processor
 output if -g is not used in the compile. The unifier is slower than a