|
1 |
| -rust: reproducibility issue fix with v1.80 |
| 1 | +rust: reproducibility issue fix with v1.81 |
2 | 2 |
|
3 | 3 | A few crates are using the updated version of the 'cc' crate and this is causing the generated object file names containing a unique hashmap id.
|
4 | 4 | By the following changes same hash values will be genarted even for diffrent build paths.
|
|
49 | 49 | let obj = dst
|
50 | 50 | .join(format!("{:016x}-{}", hasher.finish(), basename))
|
51 | 51 | .with_extension("o");
|
| 52 | +diff --git a/vendor/cc-1.0.99/src/command_helpers.rs b/vendor/cc-1.0.99/src/command_helpers.rs |
| 53 | +index fe919a5239..2b1f442019 100644 |
| 54 | +--- a/vendor/cc-1.0.99/src/command_helpers.rs |
| 55 | ++++ b/vendor/cc-1.0.99/src/command_helpers.rs |
| 56 | +@@ -257,6 +257,7 @@ fn wait_on_child( |
| 57 | + /// and store them in the output Object. |
| 58 | + pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec<Object>, Error> { |
| 59 | + let mut objects = Vec::with_capacity(files.len()); |
| 60 | ++ let target_substring = ["rustc"]; |
| 61 | + for file in files { |
| 62 | + let basename = file |
| 63 | + .file_name() |
| 64 | +@@ -277,10 +278,29 @@ pub(crate) fn objects_from_files(files: &[Arc<Path>], dst: &Path) -> Result<Vec< |
| 65 | + })? |
| 66 | + .to_string_lossy(); |
| 67 | + |
| 68 | ++ // Function to find the position of the first occurrence of the target substring |
| 69 | ++ fn find_target_position(s: &str, targets: &[&str]) -> Option<usize> { |
| 70 | ++ let mut pos = None; |
| 71 | ++ for target in targets { |
| 72 | ++ if let Some(index) = s.rfind(target) { |
| 73 | ++ //If a target is found and pos is None, set it |
| 74 | ++ if pos.is_none() || index < pos.unwrap() { |
| 75 | ++ pos = Some(index); |
| 76 | ++ } |
| 77 | ++ } |
| 78 | ++ } |
| 79 | ++ pos |
| 80 | ++ } |
| 81 | ++ |
| 82 | ++ let filtered_dirname = if let Some(pos) = find_target_position(&dirname, &target_substring) { |
| 83 | ++ dirname[pos..].to_string() //Keep everything from the target substring onwards |
| 84 | ++ } else { |
| 85 | ++ dirname.to_string() //If target substring is not found, keep the original dirname |
| 86 | ++ }; |
| 87 | + // Hash the dirname. This should prevent conflicts if we have multiple |
| 88 | + // object files with the same filename in different subfolders. |
| 89 | + let mut hasher = hash_map::DefaultHasher::new(); |
| 90 | +- hasher.write(dirname.to_string().as_bytes()); |
| 91 | ++ hasher.write(filtered_dirname.as_bytes()); |
| 92 | + let obj = dst |
| 93 | + .join(format!("{:016x}-{}", hasher.finish(), basename)) |
| 94 | + .with_extension("o"); |
| 95 | +diff --git a/vendor/cc-1.0.99/.cargo-checksum.json b/vendor/cc-1.0.99/.cargo-checksum.json |
| 96 | +index b070eeb322..ba768ff86f 100644 |
| 97 | +--- a/vendor/cc-1.0.99/.cargo-checksum.json |
| 98 | ++++ b/vendor/cc-1.0.99/.cargo-checksum.json |
| 99 | +@@ -1 +1 @@ |
| 100 | +-{"files":{"Cargo.toml":"3c555dbe1a698f12b66c8a5748ed52ff26ff7b8ebb12237c1a72a1cbe4b9392e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"15afbc35930a5a53f00d74a8910cff35caeb5511c26642cffe5630377aced901","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"92440d3adb5cb6ea05596d9ca860a205d3937dbf0fc959e524bac5f2b748c1af","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"352a0295c965c684904329d334f3b9889db3a9c3f201701f8db44e4d00e00515","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"342be00f6215e161d8163e272a2945bb9f52f171648e15e11d46800a73186955","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"e13c439a96d8311ba8d37b9d5522cd6997d94261cbb95517c82df70525acaa7f","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"4c350cddbce1557682b7f40cd917cc4f131ad89ff2e34c23d629014ed8d7203e","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"} |
| 101 | +\ No newline at end of file |
| 102 | ++{"files":{"Cargo.toml":"3c555dbe1a698f12b66c8a5748ed52ff26ff7b8ebb12237c1a72a1cbe4b9392e","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"f1ddbede208a5b78333a25dac0a7598e678e9b601a7d99a791069bddaf180dfe","src/command_helpers.rs":"4c4a9ea55a109dbeada9e23d4ec963c257a56451b5fd16c7e4e8b97374f1a2ff","src/detect_compiler_family.c":"72903b91d7a28f49b39e7d730f4c9c4bb39fb901948fa1279cd08abf392f5a29","src/lib.rs":"92440d3adb5cb6ea05596d9ca860a205d3937dbf0fc959e524bac5f2b748c1af","src/parallel/async_executor.rs":"4ce24435fff6b6555b43fee042c16bd65d4150d0346567f246b9190d85b45983","src/parallel/job_token.rs":"352a0295c965c684904329d334f3b9889db3a9c3f201701f8db44e4d00e00515","src/parallel/mod.rs":"bd9c1334d17d138c281961c690b8d8118a2d6295a7d6cd7296826255436fa063","src/parallel/stderr.rs":"a2d18ba3f2e04deb9047ece9ab7ca5452d9a76b515afbe20a76307e31597f34b","src/target_info.rs":"342be00f6215e161d8163e272a2945bb9f52f171648e15e11d46800a73186955","src/tempfile.rs":"47a58e904ac07da6682004b5b615dc83250b253a8d3e8ba1b9bcaf6cdf4fd142","src/tool.rs":"e13c439a96d8311ba8d37b9d5522cd6997d94261cbb95517c82df70525acaa7f","src/windows/com.rs":"a2800ddb81215fff2bf618336f5c4ff8e8bdb746dd18b795873c7304b3f2a5e3","src/windows/find_tools.rs":"4c350cddbce1557682b7f40cd917cc4f131ad89ff2e34c23d629014ed8d7203e","src/windows/mod.rs":"42f1ad7fee35a17686b003e6aa520d3d1940d47d2f531d626e9ae0c48ba49005","src/windows/registry.rs":"c521b72c825e8095843e73482ffa810ed066ad8bb9f86e6db0c5c143c171aba1","src/windows/setup_config.rs":"754439cbab492afd44c9755abcbec1a41c9b2c358131cee2df13c0e996dbbec8","src/windows/vs_instances.rs":"76e3cee74b5fd38ddaf533bba11fe401667c50dda5f9d064099840893eaa7587","src/windows/winapi.rs":"250d51c1826d1a2329e9889dd9f058cfce253dbf2a678b076147c6cdb5db046c","src/windows/windows_sys.rs":"5a440eb39d8a0c176b66177e8753186797793bc5d7896292c408fb44c12dfed3"},"package":"96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"} |
52 | 103 | --- a/vendor/cc-1.0.97/.cargo-checksum.json
|
53 | 104 | +++ b/vendor/cc-1.0.97/.cargo-checksum.json
|
54 | 105 | @@ -1 +1 @@
|
|
0 commit comments