When using the CBUILD toolchain, it makes no sense to look for headers
and libraries in the CHOST-based SYSROOT.
Signed-off-by: Mike Gilbert <flop...@gentoo.org>
---
eclass/toolchain-funcs.eclass | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index cde84e6f34c8..58a718180079 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -1,4 +1,4 @@
-# Copyright 2002-2023 Gentoo Authors
+# Copyright 2002-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: toolchain-funcs.eclass
@@ -384,6 +384,12 @@ tc-export_build_env() {
# the target build system does not check.
tc-env_build() {
tc-export_build_env
+ local -x SYSROOT=
+ if [[ ${EAPI} == 6 ]]; then
+ local -x ESYSROOT=${EPREFIX}
+ else
+ local -x ESYSROOT=${BROOT}
+ fi
CFLAGS=${BUILD_CFLAGS} \
CXXFLAGS=${BUILD_CXXFLAGS} \
CPPFLAGS=${BUILD_CPPFLAGS} \
--
2.44.0
