From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1092727-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 20AF3138334
for <garchives@archives.gentoo.org>; Sat, 25 May 2019 06:16:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 1C329E07D0;
Sat, 25 May 2019 06:16:27 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 EF623E07D0
for <gentoo-commits@lists.gentoo.org>; Sat, 25 May 2019 06:16:26 +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 61324344FAF
for <gentoo-commits@lists.gentoo.org>; Sat, 25 May 2019 06:16:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E6006449
for <gentoo-commits@lists.gentoo.org>; Sat, 25 May 2019 06:16:22 +0000 (UTC)
From: "Benda XU" <heroxbd@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, "Benda XU" <heroxbd@gentoo.org>
Message-ID: <1558764935.c6c9d0a9d44b8d17e843306c2ebb2c775b2e7840.heroxbd@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: heroxbd
X-VCS-Committer-Name: Benda XU
X-VCS-Revision: c6c9d0a9d44b8d17e843306c2ebb2c775b2e7840
X-VCS-Branch: master
Date: Sat, 25 May 2019 06:16:22 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 80f805f2-113a-437f-8a89-8fbbf8d90987
X-Archives-Hash: 2afc50738460492b0053fc16e1370f9d
commit: c6c9d0a9d44b8d17e843306c2ebb2c775b2e7840
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 06:42:14 2019 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Sat May 25 06:15:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=c6c9d0a9
scripts/bootstrap-prefix.sh: consistant stage2 compiler and linker.
The host linker might not work well with stage2 compiler.
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
scripts/bootstrap-prefix.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index b213cb7a3b..b3ab8cb4bb 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -1818,10 +1818,6 @@ bootstrap_stage3() {
export LDFLAGS="-L${ROOT}/usr/$(get_libdir) -Wl,--dynamic-linker=${RAP_DLINKER}"
BOOTSTRAP_RAP=yes \
with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
-
- # remove stage2 ld so that stage3 ld is used by stage2 gcc.
- [[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && \
- mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
else
pkgs=(
sys-apps/gentoo-functions
@@ -1838,6 +1834,9 @@ bootstrap_stage3() {
with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1
fi
+ # remove stage2 ld so that stage3 ld is used by stage2 gcc.
+ is-rap && [[ -f ${ROOT}/tmp/usr/${CHOST}/bin/ld ]] && \
+ mv ${ROOT}/tmp/usr/${CHOST}/bin/ld{,.stage2}
# On some hosts, gcc gets confused now when it uses the new linker,
# see for instance bug #575480. While we would like to hide that