From: Matt Turner <mattst88@gentoo.org>
Date: Sun, 29 Mar 2020 17:20:24 +0000 (-0700)
Subject: scripts/bootstrap.sh: Expand virtual/os-headers fallback
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f3f818eb40d144d40e2496cc87eceea79db380f8;p=gentoo.git

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@gentoo.org>
---

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index bfe81ac51ddf..e0dae52f02de 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}"