From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1157483-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 550F4138239
	for <garchives@archives.gentoo.org>; Sun, 29 Mar 2020 17:45:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7B12DE0982;
	Sun, 29 Mar 2020 17:45:26 +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 63A21E0982
	for <gentoo-commits@lists.gentoo.org>; Sun, 29 Mar 2020 17:45:26 +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 47DEC34F544
	for <gentoo-commits@lists.gentoo.org>; Sun, 29 Mar 2020 17:45:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D2D8D158
	for <gentoo-commits@lists.gentoo.org>; Sun, 29 Mar 2020 17:45:23 +0000 (UTC)
From: "Matt Turner" <mattst88@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, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1585503879.f3f818eb40d144d40e2496cc87eceea79db380f8.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/
X-VCS-Repository: repo/gentoo
X-VCS-Files: scripts/bootstrap.sh
X-VCS-Directories: scripts/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: f3f818eb40d144d40e2496cc87eceea79db380f8
X-VCS-Branch: master
Date: Sun, 29 Mar 2020 17:45:23 +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: cbe4d125-fe87-4be0-a48d-6a5c58e64bf3
X-Archives-Hash: 49a4217d53bca131e35f713fc7f6392f

commit:     f3f818eb40d144d40e2496cc87eceea79db380f8
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 17:20:24 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:44:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f818eb

scripts/bootstrap.sh: Expand virtual/os-headers fallback

Unlikely that this fallback will ever be hit, but might as well prepare.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 scripts/bootstrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index bfe81ac51dd..e0dae52f02d 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -292,7 +292,7 @@ if [[ ${USE_NPTL} = "1" ]] ; then
 	# Should we build with nptl only?
 	[[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly"
 fi
-[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers"
+[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"
 
 einfo "Using baselayout : ${myBASELAYOUT}"
 einfo "Using portage    : ${myPORTAGE}"