| 1 |
commit: 5025a353887de4e70e4ac960f9ec2051b387e1e2 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 3 11:58:41 2022 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 3 12:01:35 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5025a353 |
| 7 |
|
| 8 |
scripts/bootstrap-prefix: force CXXFLAGS for GCC to find our includes |
| 9 |
|
| 10 |
GCC apparently at some point stops looking at CPPFLAGS, which causes it |
| 11 |
not to "see" our includes. So, use CXXFLAGS isntead while we don't have |
| 12 |
helpers to make this work. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/778014 |
| 15 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 16 |
|
| 17 |
scripts/bootstrap-prefix.sh | 4 ++++ |
| 18 |
1 file changed, 4 insertions(+) |
| 19 |
|
| 20 |
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh |
| 21 |
index 2ccb649216..c7bf16eedb 100755 |
| 22 |
--- a/scripts/bootstrap-prefix.sh |
| 23 |
+++ b/scripts/bootstrap-prefix.sh |
| 24 |
@@ -1935,9 +1935,13 @@ bootstrap_stage2() { |
| 25 |
for pkg in ${compiler_stage1} ; do |
| 26 |
# <glibc-2.5 does not understand .gnu.hash, use |
| 27 |
# --hash-style=both to produce also sysv hash. |
| 28 |
+ # GCC apparently drops CPPFLAGS at some point, which makes it |
| 29 |
+ # not find things like gmp which we just installed, so force it |
| 30 |
+ # to find our prefix |
| 31 |
EXTRA_ECONF="--disable-bootstrap $(rapx --with-linker-hash-style=both) --with-local-prefix=${ROOT}" \ |
| 32 |
MYCMAKEARGS="-DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=OFF" \ |
| 33 |
GCC_MAKE_TARGET=all \ |
| 34 |
+ OVERRIDE_CXXFLAGS="${CPPFLAGS} -O2 -pipe" \ |
| 35 |
TPREFIX="${ROOT}" \ |
| 36 |
PYTHON_COMPAT_OVERRIDE=python${PYTHONMAJMIN} \ |
| 37 |
emerge_pkgs --nodeps ${pkg} || return 1 |
Archives