Install GHC bindist in relocatable mode on Unix #853
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
On some platforms autotools will instead default to EPREFIX/lib64. To minimize differences in installed GHC bindists, we pin EPREFIX/lib.
mboes
approved these changes
Apr 29, 2019
haskell/ghc_bindist.bzl
Outdated
| _execute_fail_loudly(ctx, ["make", "install"]) | ||
| ctx.file("patch_bins", executable=True, content="""#!/usr/bin/env bash | ||
| set -x |
There was a problem hiding this comment.
The tracing stuff should probably go.
There was a problem hiding this comment.
Removed. Sorry, overlooked that.
mboes
reviewed
Apr 29, 2019
haskell/ghc_bindist.bzl
Outdated
| @@ -212,8 +212,20 @@ def _ghc_bindist_impl(ctx): | |||
|
|
|||
| # On Windows the bindist already contains the built executables | |||
| if os != "windows": | |||
| _execute_fail_loudly(ctx, ["./configure", "--prefix", bindist_dir.realpath]) | |||
| _execute_fail_loudly(ctx, ["sed", "-i", "s/RelocatableBuild = NO/RelocatableBuild = YES/", "mk/config.mk.in"]) | |||
| _execute_fail_loudly(ctx, ["./configure", "--prefix", bindist_dir.realpath, "--libdir", "${exec_prefix}/lib"]) | |||
There was a problem hiding this comment.
Where does ${exec_prefix} come from?
There was a problem hiding this comment.
${exec_prefix} is defined within mk/install.mk. However, it turns out that ${exec_prefix}/lib is the default for RelocatableBuild = YES. So the --libdir flag is redundant. I've removed it.
- Configure Unix bindist to be relocatable. - Patch bin wrapper scripts to not hard-code the execroot. This makes their cache key independent of platform details, like the path to the user's home directory.
`readlink -f` does not work on MacOS. Replace it by a cross platform version.
`${exec_prefix}/lib` is the default in case of `RelocatableBuild = YES`.
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.
On Unix the GHC bindist requires to execute
./configure && make && make install. In its default configuration, it hard-codes the absolute path to the bindist installation dir into various places in the final bindist. This affects the hashes and thereby cache keys, as the absolute install path will likely differ on different machines. This patch builds the bindist in relocatable mode on Unix and patches the generated wrapper scripts to no longer hard-code the absolute installation path.--libdirtoEPREFIX/lib. On some platforms autotools defaults toEPREFIX/lib64, instead.