From ffe23405d0b1927b090865608e8ed38894095d49 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Wed, 20 Nov 2024 00:48:26 +1100
Subject: [PATCH 1/3] Fix two files with different extensions having the same
 object name

Fix #1294
---
 src/command_helpers.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/command_helpers.rs b/src/command_helpers.rs
index adedab29..be28030a 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) = basename.extension() {
+            hasher.write(extension.to_string_lossy().as_bytes());
+        }
         let obj = dst
             .join(format!("{:016x}-{}", hasher.finish(), basename))
             .with_extension("o");

From c8dc108e16a1cfbb48c4dd61bb4ff31a859e2bb1 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Wed, 20 Nov 2024 00:50:55 +1100
Subject: [PATCH 2/3] Fix compilation

---
 src/command_helpers.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/command_helpers.rs b/src/command_helpers.rs
index be28030a..62e36629 100644
--- a/src/command_helpers.rs
+++ b/src/command_helpers.rs
@@ -327,7 +327,7 @@ pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<
         };
 
         hasher.write(dirname.as_bytes());
-        if let Some(extension) = basename.extension() {
+        if let Some(extension) = file.extension() {
             hasher.write(extension.to_string_lossy().as_bytes());
         }
         let obj = dst

From d62d76ea215ae4c06fa9574f866afbd88e5d8247 Mon Sep 17 00:00:00 2001
From: Jiahao XU <30436523+NobodyXu@users.noreply.github.com>
Date: Wed, 20 Nov 2024 00:59:18 +1100
Subject: [PATCH 3/3] Fix gnu and msvc smoke test

---
 tests/test.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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]