From b70d54b657e7db58391d47829a28a2eaeee9ba38 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 28 Dec 2021 13:59:24 -0600 Subject: [PATCH] gcc: backport fix for Canadian builds * Canadian builds are broken in gcc 11.2.0 * error: 'fenv_t' has not been declared in '::' * https://gcc.gnu.org/pipermail/gcc-patches/2021-December/587255.html * https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100017 * https://gcc.gnu.org/g:01a70ccd723eb9a479186fe37c972b0d0f8676cf Change-Id: I0bbadd3bec5ddc4b1f1e01e7e6a648f54bfd59bf Reviewed-on: https://review.haiku-os.org/c/buildtools/+/4835 Reviewed-by: Alex von Gluck IV --- gcc/libstdc++-v3/src/c++17/Makefile.am | 2 +- gcc/libstdc++-v3/src/c++17/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/libstdc++-v3/src/c++17/Makefile.am b/gcc/libstdc++-v3/src/c++17/Makefile.am index cb94aff5f1..2aebc6d525 100644 --- a/gcc/libstdc++-v3/src/c++17/Makefile.am +++ b/gcc/libstdc++-v3/src/c++17/Makefile.am @@ -79,7 +79,7 @@ endif # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden # as the occasion calls for it. AM_CXXFLAGS = \ - -std=gnu++17 \ + -std=gnu++17 -nostdinc++ \ $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \ diff --git a/gcc/libstdc++-v3/src/c++17/Makefile.in b/gcc/libstdc++-v3/src/c++17/Makefile.in index 63984ecd52..8c02be6514 100644 --- a/gcc/libstdc++-v3/src/c++17/Makefile.in +++ b/gcc/libstdc++-v3/src/c++17/Makefile.in @@ -455,7 +455,7 @@ libc__17convenience_la_SOURCES = $(sources) $(inst_sources) # OPTIMIZE_CXXFLAGS on the compile line so that -O2 can be overridden # as the occasion calls for it. AM_CXXFLAGS = \ - -std=gnu++17 \ + -std=gnu++17 -nostdinc++ \ $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \ $(XTEMPLATE_FLAGS) $(VTV_CXXFLAGS) \ $(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS) \