Restore reproducible libs (#2402)

microsoft · Mar 29, 2023 · 91e0a5c · 91e0a5c
1 parent 36ea325
commit 91e0a5c
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/lib.yml b/.github/workflows/lib.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Build gnu libs
         shell: cmd
         run: |
-          set PATH=%PATH%;C:\msys64\mingw64\bin
+          set PATH=C:\msys64\mingw64\bin;%PATH%
           cargo run -p tool_gnu -- all
 
       - name: Build i686_msvc

diff --git a/crates/targets/i686_gnu/lib/libwindows.a b/crates/targets/i686_gnu/lib/libwindows.a
diff --git a/crates/targets/i686_msvc/lib/windows.lib b/crates/targets/i686_msvc/lib/windows.lib
diff --git a/crates/targets/x86_64_gnu/lib/libwindows.a b/crates/targets/x86_64_gnu/lib/libwindows.a
diff --git a/crates/targets/x86_64_msvc/lib/windows.lib b/crates/targets/x86_64_msvc/lib/windows.lib
diff --git a/crates/tools/gnu/src/main.rs b/crates/tools/gnu/src/main.rs
@@ -109,6 +109,8 @@ EXPORTS
         // Ensure consistency in the prefixes used by dlltool.
         cmd.arg("-t");
         cmd.arg(format!("{library}_").replace('.', "_").replace('-', "_"));
+        // Ensure deterministic output. (dlltool might be built with DEFAULT_AR_DETERMINISTIC=0)
+        cmd.arg("--deterministic-libraries");
     }
     cmd.output().unwrap();
 

diff --git a/crates/tools/msvc/src/main.rs b/crates/tools/msvc/src/main.rs
@@ -67,6 +67,8 @@ fn main() {
             break;
         }
     }
+    archive.flush().unwrap();
+    drop(archive);
 
     std::fs::rename(output.join("windows.lib"), format!("crates/targets/{platform}/lib/windows.lib")).unwrap();
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,6 +67,8 @@ fn main() { @@
                 break;
             }
         }
+        archive.flush().unwrap();
+        drop(archive);
         std::fs::rename(output.join("windows.lib"), format!("crates/targets/{platform}/lib/windows.lib")).unwrap();
     }
@@ Expand Down @@