From 7242372e734597a006b70ebf3d1c7dca212b4920 Mon Sep 17 00:00:00 2001 From: Joel Rosdahl Date: Fri, 22 Jul 2022 22:35:35 +0200 Subject: [PATCH] fix: Restore order of cpp and cppstderr sections in input hash This retains input hash compatibility with revisions before 64fc42ca2c5c9fe60ef4f1dc3882edb5f35579d6. (cherry picked from commit 11f3d650f94fce6766302642c74b92462c263bdd) --- src/ccache.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ccache.cpp b/src/ccache.cpp index 561b5c3d8..ec33db832 100644 --- a/src/ccache.cpp +++ b/src/ccache.cpp @@ -1170,12 +1170,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()) { -- 2.47.2