Support clang on macos prefix #34
Conversation
Bug: https://bugs.gentoo.org/758167 Signed-off-by: Alexey Sokolov <[email protected]>
|
@grobian can you take a look? |
| @@ -1695,7 +1698,6 @@ do_emerge_pkgs() { | |||
| -fortran | |||
| -gdbm | |||
| -git | |||
| -libcxx | |||
There was a problem hiding this comment.
Is this is going to break non-clang bootstraps?
There was a problem hiding this comment.
Nope, gcc doesn't use libcxx at all
| @@ -2221,11 +2286,37 @@ bootstrap_stage3() { | |||
| ln -s bash "${ROOT}"/bin/sh | |||
| fi | |||
|
|
|||
| # Start using apps from the final destination Prefix | |||
| export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin" | |||
There was a problem hiding this comment.
this var used to be picked up by portage, are we sure the below replacement is picked up by portage?
There was a problem hiding this comment.
Special handling of PREROOTPATH was removed from portage in gentoo/portage@69f2221
I reimplemented here what it was doing before, but with the current portage version.
| export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin" | ||
| # Start using apps from new target | ||
| cat > "${ROOT}"/tmp/etc/env.d/10stage3 <<-EOF | ||
| PATH="${ROOT}/usr/bin:${ROOT}/bin:${ROOT}" |
There was a problem hiding this comment.
what is the trailing ROOT supposed to be here? what lives there?
There was a problem hiding this comment.
Not sure, maybe it was a typo.
I no longer have Mac available, so can't test what happens without it.
|
|
||
| # Get a sane bash, overwriting tmp symlinks | ||
| pre_emerge_pkgs "" "app-shells/bash" || return 1 | ||
| ln -s "${ROOT}"/bin/bash "${ROOT}"/usr/bin/bash |
There was a problem hiding this comment.
this is weird
bin should be a symlink to usr/bin, and thus this should break or complain about both arguments being the same file
There was a problem hiding this comment.
I don't remember anymore why this line was necessary
There was a problem hiding this comment.
Perhaps on the darwin profile bin is not a symlink to usr/bin?
Bug: https://bugs.gentoo.org/758167