diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-20 09:35:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-20 09:35:03 +0200 |
| commit | 6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80 (patch) | |
| tree | b35ca00e86dfcff8ca05b8e4737cd10b7545c2fb /mesalib/scons/custom.py | |
| parent | 9bea2bf9069195c27824644331d4a275ea3df9f4 (diff) | |
| parent | 4703c93aaecf0d5794eca723cd5b1b72b04d04ee (diff) | |
| download | vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.gz vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.tar.bz2 vcxsrv-6dbcc9a627a91ad8ef03f5074a4fc3c726cdfd80.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/common.py
mesalib/scons/custom.py
mesalib/scons/gallium.py
mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
mesalib/src/mesa/main/fbobject.c
mesalib/src/mesa/main/teximage.c
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/state_tracker/st_format.c
xorg-server/configure.ac
xorg-server/exa/exa_unaccel.c
Diffstat (limited to 'mesalib/scons/custom.py')
| -rw-r--r-- | mesalib/scons/custom.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py index 106ffcfd1..d18f5642d 100644 --- a/mesalib/scons/custom.py +++ b/mesalib/scons/custom.py @@ -157,7 +157,8 @@ def createCodeGenerateMethod(env): def generate(env):
"""Common environment generation code"""
- if env.get('quiet', True):
+ verbose = env.get('verbose', False) or not env.get('quiet', True)
+ if not verbose:
quietCommandLines(env)
# Custom builders and methods
|