Don't hash -U in the preprocessor mode

diff --git a/NEWS.txt b/NEWS.txt
index 03797adfbaee80976489261b75102eca0ca1ab5d..e5b3f166cb70b684723d55a5471d7c9ded3faaa9 100644 (file)
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -100,6 +100,10 @@ New features and improvements
     - For debugging purposes, the variable `CCACHE_VERBOSE` may now be set to
       make ccache print executed commands to standard output.
 
+    - The following options are no longer hashed in the preprocessor mode:
+      `-imacros`, `-iprefix`, `-iwithprefix`, `-iwithprefixbefore`,
+      `-nostdinc`, `-nostdinc++` and `-U`.
+
 
 Bug fixes
 ~~~~~~~~~

diff --git a/ccache.c b/ccache.c
index ea25a27780fbe333c05ddea82fa2622830a7da3c..1cd4cec70087df7bc28973f123fd3c150cb69ba8 100644 (file)
--- a/ccache.c
+++ b/ccache.c
@@ -863,7 +863,8 @@ static struct file_hash *calculate_object_hash(
                                    strcmp(args->argv[i], "-idirafter") == 0 ||
                                    strcmp(args->argv[i], "-isystem") == 0 ||
                                    strcmp(args->argv[i], "-nostdinc") == 0 ||
-                                   strcmp(args->argv[i], "-nostdinc++") == 0) {
+                                   strcmp(args->argv[i], "-nostdinc++") == 0 ||
+                                   strcmp(args->argv[i], "-U") == 0) {
                                        /* Skip from hash. */
                                        i++;
                                        continue;