summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMats Wichmann <mats@linux.com>2019-08-23 13:56:49 (GMT)
committerMats Wichmann <mats@linux.com>2019-09-07 19:17:06 (GMT)
commitbbbedc60fea8b4c0cac6905aea2737d40a3988f0 (patch)
treea2114fffeabb5b54d568be628b526bf743ea0324 /doc
parent3b4c6b9dc3bd9ee8479751ecb188010084c39977 (diff)
downloadSCons-bbbedc60fea8b4c0cac6905aea2737d40a3988f0.zip
SCons-bbbedc60fea8b4c0cac6905aea2737d40a3988f0.tar.gz
SCons-bbbedc60fea8b4c0cac6905aea2737d40a3988f0.tar.bz2
[PR #3425] further tweak "default" tool wording [ci skip]
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/generated/tools.gen26
1 files changed, 13 insertions, 13 deletions
diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen
index bb2b71f..f542118 100644
--- a/doc/generated/tools.gen
+++ b/doc/generated/tools.gen
@@ -140,22 +140,22 @@ Set construction variables for cygwin linker/loader.
<listitem>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
Sets <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction variables</literal> for a default list of Tool modules.
-Include <emphasis role="bold">default</emphasis>
-in the tools list to retain
-the tools that would have been available if no
-<parameter>tools</parameter> parameter were supplied
-to an <emphasis role="bold">Environment</emphasis>
-or <emphasis role="bold">Clone</emphasis> call.
+Use <emphasis role="bold">default</emphasis>
+in the tools list to retain the original defaults,
+since the <parameter>tools</parameter> parameter
+is treated as a literal statement of the tools
+to be made available in that <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction environment</literal>, not an addition.
</para>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
-The list of available tools from default is dependent both on
-the platform and what software is installed on the platform.
+The list of tools selected by default is not static,
+but is dependent both on
+the platform and on the software installed on the platform.
Some tools will not initialize if an underlying command is
not found, and some tools are selected from a list of choices
on a first-found basis. The finished tool list can be
examined by inspecting the <envar>TOOLS</envar> <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction variable</literal>
-variable in the <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction environment</literal>.
+in the <literal xmlns="http://www.scons.org/dbxsd/v1.0">construction environment</literal>.
</para>
<para xmlns="http://www.scons.org/dbxsd/v1.0">
@@ -168,7 +168,7 @@ tex, latex, pdflatex, pdftex, tar, zip, textfile.
<para xmlns="http://www.scons.org/dbxsd/v1.0">
On Linux systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
gcc, intelc, icc, cc;
a C++ compiler from
g++, intelc, icc, cxx;
@@ -185,7 +185,7 @@ m4, rpm.
<para xmlns="http://www.scons.org/dbxsd/v1.0">
On Windows systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
msvc, mingw, gcc, intelc, icl, icc, cc, bcc32;
a C++ compiler from
msvc, intelc, icc, g++, cxx, bcc32;
@@ -203,7 +203,7 @@ msvs, midl.
<para xmlns="http://www.scons.org/dbxsd/v1.0">
On MacOS systems, the default tools list selects
-(first-found) a C compiler from
+(first-found): a C compiler from
gcc, cc;
a C++ compiler from
g++, cxx;
@@ -212,7 +212,7 @@ a linker from
applelink, gnulink;
a Fortran compiler from
gfortran, f95, f90, g77;
-and a static archiver 'ar'.
+and a static archiver ar.
It also selects all found from the list
m4, rpm.
</para>