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 20EC6138330 for ; Sat, 6 Jan 2018 14:27:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 509CBE08A0; Sat, 6 Jan 2018 14:27:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 31404E08A0 for ; Sat, 6 Jan 2018 14:27:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 511CD335C30 for ; Sat, 6 Jan 2018 14:27:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1674B195 for ; Sat, 6 Jan 2018 14:27:27 +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: <1515248826.d54d253614e3f1c5baf3d81370ee32f081134b77.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: d54d253614e3f1c5baf3d81370ee32f081134b77 X-VCS-Branch: master Date: Sat, 6 Jan 2018 14:27:27 +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-Archives-Salt: f8736ba9-82c5-488e-b926-56638aed61d4 X-Archives-Hash: 890a74e3d895af6816bef467ffa575b1 commit: d54d253614e3f1c5baf3d81370ee32f081134b77 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 6 14:27:06 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jan 6 14:27:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d54d2536 scripts/bootstrap-prefix: have bootstrap_make install gmake symlink If we set MAKE=gmake before, ensure that we use the just compiled make by providing a gmake symlink. scripts/bootstrap-prefix.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 78c62ea314..dbce4d4256 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1057,6 +1057,10 @@ bootstrap_tar() { bootstrap_make() { MAKEOPTS= # no GNU make yet bootstrap_gnu make 3.82 + if [[ ${MAKE} == gmake ]] ; then + # make make available as gmake + ( cd ${ROOT}/tmp/usr/bin && ln -s make gmake ) + fi } bootstrap_patch() {