From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 1 Jun 2024 18:46:26 +0000 (+0200)
Subject: refactor: Convert ArgsInfo::orig_output_obj to fs::path
X-Git-Tag: v4.11~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0480f16839ebaf601d4fc25f55b6a81391b60a0b;p=thirdparty%2Fccache.git

refactor: Convert ArgsInfo::orig_output_obj to fs::path
---

diff --git a/src/ccache/ArgsInfo.hpp b/src/ccache/ArgsInfo.hpp
index 642c1c2d..dac13dec 100644
--- a/src/ccache/ArgsInfo.hpp
+++ b/src/ccache/ArgsInfo.hpp
@@ -44,7 +44,7 @@ struct ArgsInfo
   bool expect_output_obj = true;
 
   // The output file being compiled to.
-  std::string orig_output_obj;
+  std::filesystem::path orig_output_obj;
 
   // The output file being compiled to, potentially rewritten into relative.
   std::string output_obj;
diff --git a/src/ccache/argprocessing.cpp b/src/ccache/argprocessing.cpp
index 337975ae..cb6e5cf1 100644
--- a/src/ccache/argprocessing.cpp
+++ b/src/ccache/argprocessing.cpp
@@ -1453,8 +1453,8 @@ process_args(Context& ctx)
     || is_precompiled_header(args_info.output_obj);
 
   if (args_info.output_is_precompiled_header && output_obj_by_source) {
-    args_info.orig_output_obj = util::pstr(util::add_extension(
-      args_info.orig_input_file, get_default_pch_file_extension(config)));
+    args_info.orig_output_obj = util::add_extension(
+      args_info.orig_input_file, get_default_pch_file_extension(config));
     args_info.output_obj =
       util::pstr(core::make_relative_path(ctx, args_info.orig_output_obj));
   }
@@ -1601,7 +1601,7 @@ process_args(Context& ctx)
     }
 
     if (!args_info.dependency_target) {
-      std::string dep_target = args_info.orig_output_obj;
+      std::string dep_target = util::pstr(args_info.orig_output_obj);
 
       // GCC and Clang behave differently when "-Wp,-M[M]D,wp.d" is used with
       // "-o" but with neither "-MMD" nor "-MT"/"-MQ": GCC uses a dependency