From a8f061147f3c25bc2b01bef798df029a619889c0 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Wed, 20 Nov 2024 18:15:15 +1000
Subject: [PATCH] Fix two files with different extensions having the same
 object name (#1295)

---
 src/command_helpers.rs | 3 +++
 tests/test.rs          | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/command_helpers.rs b/src/command_helpers.rs
index adedab29..62e36629 100644
--- a/src/command_helpers.rs
+++ b/src/command_helpers.rs
@@ -327,6 +327,9 @@ pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<
         };
 
         hasher.write(dirname.as_bytes());
+        if let Some(extension) = file.extension() {
+            hasher.write(extension.to_string_lossy().as_bytes());
+        }
         let obj = dst
             .join(format!("{:016x}-{}", hasher.finish(), basename))
             .with_extension("o");
diff --git a/tests/test.rs b/tests/test.rs
index 62976d6d..b88a8190 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -27,7 +27,7 @@ fn gnu_smoke() {
         .must_have("-ffunction-sections")
         .must_have("-fdata-sections");
     test.cmd(1)
-        .must_have(test.td.path().join("d1fba762150c532c-foo.o"));
+        .must_have(test.td.path().join("db3b6bfb95261072-foo.o"));
 }
 
 #[test]
@@ -434,7 +434,7 @@ fn msvc_smoke() {
         .must_have("-c")
         .must_have("-MD");
     test.cmd(1)
-        .must_have(test.td.path().join("d1fba762150c532c-foo.o"));
+        .must_have(test.td.path().join("db3b6bfb95261072-foo.o"));
 }
 
 #[test]