Skip to content

Commit

Permalink
scripts/bootstrap-prefix: disable USE=pie for Solaris bootstrap
Browse files Browse the repository at this point in the history
Host compiler doesn't like -pie in the workload it has to do during
bootstrap, so go through lengths to disable it.
(Why can't we just override masks/forces from base?)

Signed-off-by: Fabian Groffen <grobian@gentoo.org>
  • Loading branch information
grobian committed Jul 25, 2024
1 parent 8dad4bd commit 4abb9ba
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions scripts/bootstrap-prefix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2032,6 +2032,13 @@ bootstrap_stage2() {
# unless we only build the buildtool, bug #603012
echo "dev-build/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use

if [[ ${CHOST} == *-solaris* ]] ; then
# avoid complexities with the host toolchain
sed -i -e '/^sys-devel\/gcc pie$/d' \
"${PORTDIR}"/profiles/base/package.use.force
echo "sys-devel/gcc -pie" >> "${ROOT}"/tmp/etc/portage/package.use
fi

emerge_pkgs --nodeps "${pkgs[@]}" || return 1

# Debian multiarch supported by RAP needs ld to support sysroot.
Expand Down

0 comments on commit 4abb9ba

Please sign in to comment.