Fix two files with different extensions having the same object name (#…

…1295)
rust-lang · Nov 20, 2024 · a8f0611 · a8f0611
1 parent 29d6ca1
commit a8f0611
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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]