summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-08-21 23:12:03 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2017-08-21 23:12:03 (GMT)
commit0fb6edeeb568f47d6d5d769d6b65c0720d063b89 (patch)
tree579883acdd0cfc5c37fc75118023cb60fb917973 /src/engine/SCons/Script
parent4057431ac3b09bf0b57cfd878d51b8c2bf53d11b (diff)
parent939963642474e9f9b01adc6b42e5fda15de3fa89 (diff)
downloadSCons-0fb6edeeb568f47d6d5d769d6b65c0720d063b89.zip
SCons-0fb6edeeb568f47d6d5d769d6b65c0720d063b89.tar.gz
SCons-0fb6edeeb568f47d6d5d769d6b65c0720d063b89.tar.bz2
merge
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/Main.xml8
-rw-r--r--src/engine/SCons/Script/SConsOptions.py1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/engine/SCons/Script/Main.xml b/src/engine/SCons/Script/Main.xml
index 98db5bf..e95afbc 100644
--- a/src/engine/SCons/Script/Main.xml
+++ b/src/engine/SCons/Script/Main.xml
@@ -781,6 +781,14 @@ which corresponds to --random; and
</listitem>
</varlistentry>
<varlistentry>
+<term><literal>silent</literal></term>
+<listitem>
+<para>
+which corresponds to --silent.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
<term><literal>stack_size</literal></term>
<listitem>
<para>
diff --git a/src/engine/SCons/Script/SConsOptions.py b/src/engine/SCons/Script/SConsOptions.py
index 288a7a5..60d456e 100644
--- a/src/engine/SCons/Script/SConsOptions.py
+++ b/src/engine/SCons/Script/SConsOptions.py
@@ -139,6 +139,7 @@ class SConsValues(optparse.Values):
'random',
'stack_size',
'warn',
+ 'silent'
]
def set_option(self, name, value):