Skip to content

Commit 4abb9ba

Browse files
committed
scripts/bootstrap-prefix: disable USE=pie for Solaris bootstrap
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 <[email protected]>
1 parent 8dad4bd commit 4abb9ba

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

scripts/bootstrap-prefix.sh

+7
Original file line numberDiff line numberDiff line change
@@ -2032,6 +2032,13 @@ bootstrap_stage2() {
20322032
# unless we only build the buildtool, bug #603012
20332033
echo "dev-build/cmake -server" >> "${ROOT}"/tmp/etc/portage/package.use
20342034

2035+
if [[ ${CHOST} == *-solaris* ]] ; then
2036+
# avoid complexities with the host toolchain
2037+
sed -i -e '/^sys-devel\/gcc pie$/d' \
2038+
"${PORTDIR}"/profiles/base/package.use.force
2039+
echo "sys-devel/gcc -pie" >> "${ROOT}"/tmp/etc/portage/package.use
2040+
fi
2041+
20352042
emerge_pkgs --nodeps "${pkgs[@]}" || return 1
20362043

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

0 commit comments

Comments
 (0)