summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--rsb/building-tools-and-rtems.rst37
-rw-r--r--rsb/index.rst1
-rw-r--r--rsb/project-sets.rst24
-rw-r--r--rsb/source-builder.rst28
4 files changed, 24 insertions, 66 deletions
diff --git a/rsb/building-tools-and-rtems.rst b/rsb/building-tools-and-rtems.rst
deleted file mode 100644
index 3c4c09a..0000000
--- a/rsb/building-tools-and-rtems.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-.. SPDX-License-Identifier: CC-BY-SA-4.0
-
-.. Copyright (C) 2012, 2018 Chris Johns <chrisj@rtems.org>
-
-Building Tools and RTEMS
-========================
-
-The Quick Start section of the RTEMS Users Guide covers the typical
-information and process needed to build both an RTEMS toolset and
-RTEMS itself. This section has information on specific configuration
-options that may be needed.
-
-Controlling the Build
----------------------
-
-Build sets can be controlled via the command line to enable and disable various
-features. There is no definitive list of build options that can be listed
-because they are implemented with the configuration scripts. The best way to
-find what is available is to grep the configuration files. for ``with`` and
-``without``.
-
-Following are currently available:
-
-``--without-rtems``
- Do not build RTEMS when building an RTEMS build set.
-
-``--without-cxx``
- Do not build a C++ compiler.
-
-``--with-ada``
- Attempt to build an Ada compiler. You need a native GNAT installed.
-
-``--with-fortran``
- Attempt to build a Fortran compiler.
-
-``--with-objc``
- Attempt to build a C++ compiler.
diff --git a/rsb/index.rst b/rsb/index.rst
index 0452c45..f4594ed 100644
--- a/rsb/index.rst
+++ b/rsb/index.rst
@@ -29,7 +29,6 @@ RTEMS Source Builder (|version|).
source-builder
why-build-from-source.rst
- building-tools-and-rtems.rst
project-sets
cross-canadian-cross
third-party-packages
diff --git a/rsb/project-sets.rst b/rsb/project-sets.rst
index ed9db9b..cc63aaa 100644
--- a/rsb/project-sets.rst
+++ b/rsb/project-sets.rst
@@ -29,6 +29,12 @@ various tools. You can specialise these in your private configurations to make
use of them. If you add new generic configurations please contribute them back
to the project
+Build sets can be controlled via the command line to enable
+(``--with-<feature>``) and disable (``--without-<feature>``) various features.
+There is no definitive list of build options that can be listed because they
+are implemented with the configuration scripts. The best way to find what is
+available is to grep the configuration files for ``with`` and ``without``.
+
Bare Metal
----------
@@ -134,6 +140,24 @@ and the following uses the version control heads for ``binutils``, ``gcc``,
--macros=snapshots/binutils-gcc-newlib-gdb-head.mc \
4.11/rtems-sparc
+Following features can be enabled/disabled via the command line for the RTEMS
+build sets:
+
+``--without-rtems``
+ Do not build RTEMS when building an RTEMS build set.
+
+``--without-cxx``
+ Do not build a C++ compiler.
+
+``--with-ada``
+ Attempt to build an Ada compiler. You need a native GNAT installed.
+
+``--with-fortran``
+ Attempt to build a Fortran compiler.
+
+``--with-objc``
+ Attempt to build a C++ compiler.
+
Patches
-------
diff --git a/rsb/source-builder.rst b/rsb/source-builder.rst
index 81e4ea8..9b2f096 100644
--- a/rsb/source-builder.rst
+++ b/rsb/source-builder.rst
@@ -76,31 +76,3 @@ configuration can read the remaining sections.
If you think you have found a problem please see :ref:`Bugs, Crashes, and
Build Failures`.
-
-Controlling the Tools Build
----------------------------
-
-Build sets can be controlled via the command line to enable and disable various
-features. There is no definitive list of build options that can be listed
-because they are implemented with the configuration scripts. The best way to
-find what is available is to grep the configuration files. for ``with`` and
-``without``.
-
-Following are currently available:
-
-``--without-rtems``
- Do not build RTEMS when building an RTEMS build set.
-
-``--without-cxx``
- Do not build a C++ compiler.
-
-``--with-ada``
- Attempt to build an Ada compiler. You need a native GNAT installed.
-
-``--with-fortran``
- Attempt to build a Fortran compiler.
-
-``--with-objc``
- Attempt to build a C++ compiler.
-
-