Avoid absolute RUNPATH to rts in GHC bindist #1131
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aherrmann
force-pushed
the
absolute-rts-path
branch
from
14c536f
to
c46f1e1
Compare
mboes
approved these changes
Oct 23, 2019
The Haskell runtime library `libHSrts` comes in several flavors, e.g. the default `libHSrts` and the threaded version `libHSrts_thr`. GHC will link against one or the other, depending on whether the target is built with the `-threaded` compiler flag. If Bazel only tracks `libHSrts`, but GHC links against `libHSrts_thr`, then the Bazel controlled RUNPATH (`$ORIGIN/.../_solib_k8/...`) will not contain the correct runtime library, and the `cc_wrapper` will not remove the absolute RUNPATH `/path/to/.cache/.../lib/rts`, since it won't be redundant. This change extends `pkgdb_to_bzl.py` to include the `_thr` versions of the runtime library (and `ffi`) so that Bazel will track them and the `cc_wrapper` can remove the then redundant absolute RUNPATH.
jwiegley
force-pushed
the
absolute-rts-path
branch
from
c46f1e1
to
5b55a40
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1127
Before, rules_haskell only carried the non-threaded runtime library (
libHSrts) as aLibraryToLink, while the threaded runtime library (libHSrts_thr) was completely ignored. ThereforelibHSrts_thrwas missing in the sandbox when linking with-threadedand thecc_wrappercould not purge the absoluteRUNPATHto the GHC bindist that GHC generates automatically.This PR adds
libHSrts_thrto the tracked libraries, so thatcc_wrappercan purge the absoluteRUNPATHentry.To avoid duplicate runtime libraries
haskell_toolchain_libraries_implchooses whether to forward the threaded or non-threaded runtime library based on whether-threadedis in the toolchain'scompiler_flags. Ideally, this should be configurable on a per-target basis using Bazel configurations and transitions. However, given that previously only the non-threaded version of the library was tracked, this is no worse than the previous situation and the switch to configurations can be handled in a separate PR.