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.

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

Jump to bottom

Make build artifacts reproducible #2

Merged
merged 1 commit into from
Jul 25, 2024
Merged

Make build artifacts reproducible #2

merged 1 commit into from
Jul 25, 2024

Conversation

fmeum
Copy link
Member

@fmeum fmeum commented Jul 25, 2024

No description provided.

@fmeum
Copy link
Member Author

fmeum commented Jul 25, 2024

@illicitonion

@fmeum
Copy link
Member Author

fmeum commented Jul 25, 2024

Should we also sync in the recent upstream changes? bazel-contrib...richard-vd:musl-cross-make:master

@illicitonion
Copy link
Collaborator

Should we also sync in the recent upstream changes? bazel-contrib...richard-vd:musl-cross-make:master

Sounds good! Want to maybe create a PR with a merge commit, and if it passes CI we can just force-push a rebase?

illicitonion
illicitonion approved these changes Jul 25, 2024
View reviewed changes
Copy link
Collaborator

@illicitonion illicitonion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@illicitonion illicitonion merged commit 58e60ab into bazel-contrib:bazel-contrib Jul 25, 2024
@fmeum
Copy link
Member Author

fmeum commented Jul 26, 2024

I'm a bit confused - are we tracking https://github.com/richard-vd/musl-cross-make, which in turn is tracking https://github.com/richfelker/musl-cross-make? The last one appears to be more active, but also has more conflicts.

@illicitonion
Copy link
Collaborator

I'm a bit confused - are we tracking https://github.com/richard-vd/musl-cross-make, which in turn is tracking https://github.com/richfelker/musl-cross-make? The last one appears to be more active, but also has more conflicts.

I believe the intention is to track https://github.com/richfelker/musl-cross-make with a cherry-pick of richfelker#129 - we were tracking https://github.com/richard-vd/musl-cross-make because it had the cherry-picks, but it would be reasonable to rebase on richfelker with those cherry-picks, rather than being based on the richard-vd fork.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@illicitonion illicitonion illicitonion approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fmeum @illicitonion