From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-997754-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 73F20138330
for <garchives@archives.gentoo.org>; Mon, 15 Jan 2018 09:52:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7D6C6E081B;
Mon, 15 Jan 2018 09:52:21 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5C513E081B
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jan 2018 09:52:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1D0D9335C54
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jan 2018 09:52:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 21F0A151
for <gentoo-commits@lists.gentoo.org>; Mon, 15 Jan 2018 09:52:18 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1516009830.93a6d4fe02ee652fdf235715eb101a1e1e0623ec.grobian@gentoo>
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
X-VCS-Repository: repo/proj/prefix
X-VCS-Files: scripts/bootstrap-prefix.sh
X-VCS-Directories: scripts/
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 93a6d4fe02ee652fdf235715eb101a1e1e0623ec
X-VCS-Branch: master
Date: Mon, 15 Jan 2018 09:52:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 5364e2ea-1528-45a9-ac73-4401b7327a1a
X-Archives-Hash: ca5e8a042d637fde60cc8afd18bfde38
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