summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-07-03 08:22:54 +1000
committerChris Johns <chrisj@rtems.org>2017-07-03 10:00:36 +1000
commit0a916c3058238377802188ebc3af6b664322d8ba (patch)
tree06321cf558cbd8d19914875be7589aec128c2a35
parent4.11/gcc-4.8.3 Fix building with a newer version of gcc. (diff)
downloadrtems-source-builder-0a916c3058238377802188ebc3af6b664322d8ba.tar.bz2
gcc: Disable makenfo cause newer verisons do not build gcc-4.8 docs.
Newer makeinfo tools cannot build the existing texinfo in gcc so disable building it. This will not be fixed on the gcc branches. Updates #3027.
-rw-r--r--rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-1.cfg2
-rw-r--r--source-builder/config/gcc-common-1.cfg1
2 files changed, 3 insertions, 0 deletions
diff --git a/rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-1.cfg b/rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-1.cfg
index 875dc5c..34af586 100644
--- a/rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-1.cfg
+++ b/rtems/config/tools/rtems-gcc-4.8-newlib-2.2.0-1.cfg
@@ -21,6 +21,8 @@
%define with_threads 1
%define with_plugin 0
+%define disable_MAKEINFO 1
+
%ifn %{defined with_iconv}
%define with_iconv 1
%endif
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index 941e15c..ec81d9b 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -151,6 +151,7 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
--enable-version-specific-runtime-libs \
--disable-lto \
--enable-newlib-io-c99-formats \
+ %{?disable_MAKEINFO:MAKEINFO=missing} \
%{?with_iconv:--enable-newlib-iconv} \
%{?with_iconv:--enable-newlib-iconv-encodings=%{_newlib_iconv_encodings}} \
%{?with_threads:--enable-threads}%{!?with_threads:--disable-threads} \