summaryrefslogtreecommitdiff
path: root/numpy/distutils/command/config.py
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2014-03-18 14:53:51 -0600
committerCharles Harris <charlesr.harris@gmail.com>2014-03-18 14:53:51 -0600
commit8357e0ba2b301d03ec4f355d2619127007eb8c39 (patch)
tree88adf0bb14fd9093e14e53e8f39ddc43f9dfaea3 /numpy/distutils/command/config.py
parent6b38cdd2c2543e3957a593c48628f1daf23d48a9 (diff)
parentc2afa6213880733ee705aa847755b539ca62fb73 (diff)
downloadnumpy-8357e0ba2b301d03ec4f355d2619127007eb8c39.tar.gz
Merge pull request #4387 from abergeron/get_info
ENH: Make output of get_atlas_info conditional on system_info.verbosity
Diffstat (limited to 'numpy/distutils/command/config.py')
-rw-r--r--numpy/distutils/command/config.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
index 5d363eb4e..cadcc1dde 100644
--- a/numpy/distutils/command/config.py
+++ b/numpy/distutils/command/config.py
@@ -401,7 +401,7 @@ int main ()
def get_output(self, body, headers=None, include_dirs=None,
libraries=None, library_dirs=None,
- lang="c"):
+ lang="c", use_tee=None):
"""Try to compile, link to an executable, and run a program
built from 'body' and 'headers'. Returns the exit status code
of the program and its output.
@@ -426,7 +426,8 @@ int main ()
grabber.restore()
raise
exe = os.path.join('.', exe)
- exitstatus, output = exec_command(exe, execute_in='.')
+ exitstatus, output = exec_command(exe, execute_in='.',
+ use_tee=use_tee)
if hasattr(os, 'WEXITSTATUS'):
exitcode = os.WEXITSTATUS(exitstatus)
if os.WIFSIGNALED(exitstatus):