From 71597385817026bb8496c73201f8088b3fb01078 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 27 Jun 2017 13:54:43 +0000 Subject: Fix GCC upgrade The GCC version needs to be manually updated in a path name in libstdc++.morph, I forgot to do that in commit 64813d0134a7796 leading to this issue in stage2-gcc during bootstrap: x86_64-bootstrap-linux-gnu-g++ --sysroot=/root/ybd/tmp/tmpXB_LVo -fno-PIE -c -DIN_GCC_FRONTEND -g -O2 -DIN_GCC -fno-exceptions -fno-rtti -fasynchronous-unwind-tables -W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual -Wmissing-format-attribute -Woverloaded-virtual -pedantic -Wno-long-long -Wno-variadic-macros -Wno-overlength-strings -DHAVE_CONFIG_H -I. -Ic -I../../gcc -I../../gcc/c -I../../gcc/../include -I../../gcc/../libcpp/include -I/root/ybd/tmp/tmpXB_LVo/stage2-gcc.build/o/./gmp -I/root/ybd/tmp/tmpXB_LVo/stage2-gcc.build/gmp -I/root/ybd/tmp/tmpXB_LVo/stage2-gcc.build/o/./mpfr/src -I/root/ybd/tmp/tmpXB_LVo/stage2-gcc.build/mpfr/src -I/root/ybd/tmp/tmpXB_LVo/stage2-gcc.build/mpc/src -I../../gcc/../libdecnumber -I../../gcc/../libdecnumber/bid -I../libdecnumber -I../../gcc/../libbacktrace -o c/c-lang.o -MT c/c-lang.o -MMD -MP -MF c/.deps/c-lang.TPo ../../gcc/c/c-lang.c In file included from ../../gcc/c/c-lang.c:22:0: ../../gcc/system.h:221:11: fatal error: algorithm: No such file or directory # include ^~~~~~~~~~~ compilation terminated. --- strata/build-essential/stage2-libstdc++.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/build-essential/stage2-libstdc++.morph b/strata/build-essential/stage2-libstdc++.morph index 7ebd2da3..79a40308 100644 --- a/strata/build-essential/stage2-libstdc++.morph +++ b/strata/build-essential/stage2-libstdc++.morph @@ -27,7 +27,7 @@ configure-commands: --disable-multilib \ `# [1]` --disable-libstdcxx-threads \ `# [2]` --disable-libstdcxx-pch \ - `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/5.3.0 + `# [3]` --with-gxx-include-dir=/tools/"$TARGET_STAGE1"/include/c++/7.1.0 build-commands: - cd o && make -- cgit v1.2.1