Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: scripts/
Date: Sun, 29 Mar 2020 17:45:27
Message-Id: 1585503879.f3f818eb40d144d40e2496cc87eceea79db380f8.mattst88@gentoo
1 commit: f3f818eb40d144d40e2496cc87eceea79db380f8
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 29 17:20:24 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 29 17:44:39 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f818eb
7
8 scripts/bootstrap.sh: Expand virtual/os-headers fallback
9
10 Unlikely that this fallback will ever be hit, but might as well prepare.
11
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 scripts/bootstrap.sh | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
18 index bfe81ac51dd..e0dae52f02d 100755
19 --- a/scripts/bootstrap.sh
20 +++ b/scripts/bootstrap.sh
21 @@ -292,7 +292,7 @@ if [[ ${USE_NPTL} = "1" ]] ; then
22 # Should we build with nptl only?
23 [[ ${USE_NPTLONLY} = "1" ]] && ALLOWED_USE="${ALLOWED_USE} nptlonly"
24 fi
25 -[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="virtual/os-headers"
26 +[[ -z ${myOS_HEADERS} ]] && myOS_HEADERS="$(portageq expand_virtual / virtual/os-headers)"
27
28 einfo "Using baselayout : ${myBASELAYOUT}"
29 einfo "Using portage : ${myPORTAGE}"