Skip to content

Restore reproducible libs #2402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 29, 2023
Merged

Restore reproducible libs #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af5a5db
Ensure reproducible edits to libs are flushed to disk
riverar Mar 28, 2023
5367b2f
feedback
riverar Mar 28, 2023
d848d6d
fmt
riverar Mar 28, 2023
38cc194
result
riverar Mar 28, 2023
08067e9
gnu
riverar Mar 28, 2023
a6ac01f
use mingw tooling
riverar Mar 28, 2023
418d02f
new libs
riverar Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lib.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified crates/targets/i686_gnu/lib/libwindows.a
View file
Open in desktop
Binary file not shown.
Binary file modified crates/targets/i686_msvc/lib/windows.lib
View file
Open in desktop
Binary file not shown.
Binary file modified crates/targets/x86_64_gnu/lib/libwindows.a
View file
Open in desktop
Binary file not shown.
Binary file modified crates/targets/x86_64_msvc/lib/windows.lib
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions crates/tools/gnu/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 2 additions & 0 deletions crates/tools/msvc/src/main.rs
View file
Open in desktop
Original file line number Diff 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