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

Update to Bazel 4.0.0 #1497

Merged
merged 2 commits into from
Feb 25, 2021
Merged

Update to Bazel 4.0.0 #1497

merged 2 commits into from
Feb 25, 2021

Conversation

aherrmann
Copy link
Member

  • Update nixpkgs to latest nixpkgs-unstable.
  • Use Bazel 4.0.0 for nixpkgs and bindist.
  • Bump the version bounds in start and versions.bzl
  • rules_haskell dependencies were just updated recently on Bazel 3.7.2 #1487

@aherrmann aherrmann marked this pull request as draft February 19, 2021 17:50
@aherrmann
Copy link
Member Author

Blocked on bazelbuild/bazel#13044 --> converting to draft.

@aherrmann aherrmann force-pushed the bazel-update branch 3 times, most recently from 57986d1 to c969abc Compare February 22, 2021 14:53
@aherrmann
Copy link
Member Author

I've added a workaround for bazelbuild/bazel#13044 to unblock this: Instances of arguments starting with @ are transformed into arguments of the form -Wl,... in rules_haskell's cc_wrapper. E.g. -Xlinker -rpath -Xlinker @loader_path/... --> -Wl,-rpath,@loader_path/... and -library_name @rpath/... --> -Wl,-library_name,@rpath/.... This is only an issue on MacOS, so the Windows cc_wrapper does not need to be modified.

@aherrmann aherrmann marked this pull request as ready for review February 22, 2021 16:04
thufschmitt
thufschmitt approved these changes Feb 25, 2021
View reviewed changes
Copy link
Contributor

@thufschmitt thufschmitt left a comment

Choose a reason for hiding this comment

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

It's makes my idealistic self a bit sad to see that the bazel version has to be specified in so many places. But apart from that, all good for me 👍

@aherrmann aherrmann added the merge-queue merge on green CI label Feb 25, 2021
@aherrmann
Update to Bazel 4.0.0
7d67afe
@aherrmann
Workaround erroneous response file expansion
5688d62 
Bazel 4.0.0's own cc_wrapper expands response files. However, it
fails to make exceptions for legitimate arguments starting with
`@` on macOS, such as `-install_name @rpath/...` or `-rpath
@loader_path/...`.
We use `-Wl,...` syntax for these arguments as a workaround.
@mergify mergify bot merged commit cf1300c into master Feb 25, 2021
@mergify mergify bot deleted the bazel-update branch February 25, 2021 11:06
@mergify mergify bot removed the merge-queue merge on green CI label Feb 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thufschmitt thufschmitt thufschmitt approved these changes

@mboes mboes Awaiting requested review from mboes

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
@aherrmann @thufschmitt