Skip to content
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.

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

Commit Cargo.lock #363

Merged
merged 2 commits into from
Aug 26, 2023
Merged

Commit Cargo.lock #363

merged 2 commits into from
Aug 26, 2023

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Aug 26, 2023

As of rust-lang/cargo#8728 it is now recommended to always check in Cargo.lock. This will help with reproducability and will avoid the need for cg_clif's build system to keep it's own copy of Cargo.lock for vendoring. It will also allow tidy to run on the portable-simd workspace.

bjorn3 added 2 commits August 26, 2023 12:01
As of rust-lang/cargo#8728 it is now recommended to always check in
Cargo.lock. This will help with reproducability and will avoid the need
for cg_clif's build system to keep it's own copy of Cargo.lock for
vendoring. It will also allow tidy to run on the portable-simd
workspace.
@bjorn3
Copy link
Member Author

bjorn3 commented Aug 26, 2023

CI failure seems unrelated to this PR:

   = note: /usr/bin/ld: /rust/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-19964a87984cce8a.rlib(std-19964a87984cce8a.std.f6dab3b182b9be26-cgu.0.rcgu.o): TLS transition from R_X86_64_TLSLD to R_X86_64_TPOFF32 against `_ZN3std9panicking11panic_count17LOCAL_PANIC_COUNT7__getit3VAL17h178ac08236b8843dE.0' at 0x5af in section `.text._ZN3std2rt19lang_start_internal17h1dd1442605b126fbE' failed
          /rust/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-19964a87984cce8a.rlib: error adding symbols: Bad value
          collect2: error: ld returned 1 exit status

@calebzulawski
Copy link
Member

calebzulawski commented Aug 26, 2023

It's only cross jobs, so I'm not concerned at all. Thanks for the change!

@calebzulawski calebzulawski merged commit 6d10cd1 into rust-lang:master Aug 26, 2023
@bjorn3 bjorn3 deleted the cargo_lock branch August 26, 2023 16:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants