commit: 93a6d4fe02ee652fdf235715eb101a1e1e0623ec
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 09:50:30 2018 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 09:50:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=93a6d4fe
scripts/bootstrap-prefix: make 64-bits libgcc_s available on Solaris
This bit somehow got lost. Ensure that a 64-bit libgcc_s can be found
at runtime. Somehow the toolchain is messed up like that. This allows
programs compiled with gcc -m64 (like we do) to run.
scripts/bootstrap-prefix.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 5f6e4e2c95..7afede079e 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1428,6 +1428,12 @@ bootstrap_stage2() {
# stage and rather have it continue instead of abort the build
export MAKEINFO="echo makeinfo GNU texinfo 4.13"
+ # on Solaris 64-bits, (at least up to 10) libgcc_s resides in a
+ # non-standard location, and the compiler doesn't seem to record
+ # this in rpath while it does find it, resulting in a runtime trap
+ [[ ${CHOST} == x86_64-*-solaris* || ${CHOST} == sparcv9-*-solaris* ]]
&& \
+ cp /usr/sfw/lib/64/libgcc_s.so.1 "${ROOT}"/tmp/usr/lib/ >&
/dev/null
+
# Disable RAP directory hacks of binutils and gcc. If libc.so
# linker script provides no hint of ld-linux*.so*, ld should
# look into its default library path. Prefix library pathes
