Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/
Date: Sun, 27 Mar 2022 14:06:27
Message-Id: 1648389970.a25a710d9ccd4aa4f5a08cb035aab797913607c0.dilfridge@gentoo
1 commit: a25a710d9ccd4aa4f5a08cb035aab797913607c0
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 14:05:35 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 14:06:10 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25a710d
7
8 sys-libs/glibc: Build binaries are BROOT not SYSROOT
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 sys-libs/glibc/glibc-2.35.ebuild | 4 ++--
14 sys-libs/glibc/glibc-9999.ebuild | 4 ++--
15 2 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/sys-libs/glibc/glibc-2.35.ebuild b/sys-libs/glibc/glibc-2.35.ebuild
18 index 0237132b9373..c02fa282882f 100644
19 --- a/sys-libs/glibc/glibc-2.35.ebuild
20 +++ b/sys-libs/glibc/glibc-2.35.ebuild
21 @@ -518,8 +518,8 @@ setup_env() {
22 # Last, we need the settings of the *build* environment, not of the
23 # target environment...
24
25 - local current_binutils_path=$(env ROOT="${SYSROOT}" binutils-config -B)
26 - local current_gcc_path=$(env ROOT="${SYSROOT}" gcc-config -B)
27 + local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
28 + local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
29 einfo "Overriding clang configuration, since it won't work here"
30
31 export CC="${current_gcc_path}/gcc"
32
33 diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
34 index f9c41f6d8ccc..9ba451c12e1a 100644
35 --- a/sys-libs/glibc/glibc-9999.ebuild
36 +++ b/sys-libs/glibc/glibc-9999.ebuild
37 @@ -518,8 +518,8 @@ setup_env() {
38 # Last, we need the settings of the *build* environment, not of the
39 # target environment...
40
41 - local current_binutils_path=$(env ROOT="${SYSROOT}" binutils-config -B)
42 - local current_gcc_path=$(env ROOT="${SYSROOT}" gcc-config -B)
43 + local current_binutils_path=$(env ROOT="${BROOT}" binutils-config -B)
44 + local current_gcc_path=$(env ROOT="${BROOT}" gcc-config -B)
45 einfo "Overriding clang configuration, since it won't work here"
46
47 export CC="${current_gcc_path}/gcc"