]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
fix: Restore order of cpp and cppstderr sections in input hash
authorJoel Rosdahl <joel@rosdahl.net>
Fri, 22 Jul 2022 20:35:35 +0000 (22:35 +0200)
committerJoel Rosdahl <joel@rosdahl.net>
Fri, 22 Jul 2022 20:35:35 +0000 (22:35 +0200)
This retains input hash compatibility with revisions before
64fc42ca2c5c9fe60ef4f1dc3882edb5f35579d6.

src/ccache.cpp

index 61d56a674da64391178eba51b6938fbcfbe8afdc..f436da6c4d69be24b2f515cdaf34ba4680a788f0 100644 (file)
@@ -1184,12 +1184,12 @@ get_result_key_from_cpp(Context& ctx, Args& args, Hash& hash)
     cpp_stderr_data = result->stderr_data;
   }
 
-  hash.hash_delimiter("cppstderr");
-  hash.hash(cpp_stderr_data);
-
   hash.hash_delimiter("cpp");
   TRY(process_preprocessed_file(ctx, hash, preprocessed_path));
 
+  hash.hash_delimiter("cppstderr");
+  hash.hash(cpp_stderr_data);
+
   ctx.i_tmpfile = preprocessed_path;
 
   if (!ctx.config.run_second_cpp()) {