From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 CB073138334 for ; Thu, 10 Jan 2019 08:20:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE5D5E09A4; Thu, 10 Jan 2019 08:20:19 +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 835A7E09A4 for ; Thu, 10 Jan 2019 08:20:19 +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 56B9D335CC0 for ; Thu, 10 Jan 2019 08:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E62F509 for ; Thu, 10 Jan 2019 08:20:06 +0000 (UTC) From: "Fabian Groffen" 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" Message-ID: <1547108371.dc976fc5bc8c2d0f65127941c649d679c0063eab.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: dc976fc5bc8c2d0f65127941c649d679c0063eab X-VCS-Branch: master Date: Thu, 10 Jan 2019 08:20:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1f3b732-c915-4247-93d1-e36b8276a8ce X-Archives-Hash: 2080a0bb64f8eb1f916962b6871b7b93 commit: dc976fc5bc8c2d0f65127941c649d679c0063eab Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 10 07:27:41 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 10 08:19:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=dc976fc5 scripts/bootstrap-prefix: don't remove LDFLAGS too soon in stage3 We need LDFLAGS to ensure we link/rpath against libs in ROOT, iso ROOT/tmp whilst building. Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index cced408b42..39e508de56 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1857,7 +1857,7 @@ bootstrap_stage3() { rm -f "${ROOT}"/bin/sh ln -s bash "${ROOT}"/bin/sh fi - unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS + # start using apps from new target export PREROOTPATH="${ROOT}/usr/bin:${ROOT}/bin" # get a sane bash, overwriting tmp symlinks @@ -1900,6 +1900,7 @@ bootstrap_stage3() { emerge_pkgs "" "${pkgs[@]}" || return 1 # Switch to the proper portage. + unset CONFIG_SHELL MAKEINFO CXX CPPFLAGS LDFLAGS hash -r # Update the portage tree.