diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2022-07-22 22:35:35 +0200 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2022-08-20 14:11:54 +0200 |
| commit | 7242372e734597a006b70ebf3d1c7dca212b4920 (patch) | |
| tree | 0c8edfeee2795b28350752a8e1e7c31919cf21e3 | |
| parent | be93d81e814efa7899e3237ea70278923b31a7bc (diff) | |
| download | ccache-7242372e734597a006b70ebf3d1c7dca212b4920.tar.gz | |
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)
| -rw-r--r-- | src/ccache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ccache.cpp b/src/ccache.cpp index 561b5c3d..ec33db83 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()) { |