diff options
| author | cookedm <cookedm@localhost> | 2006-02-21 23:09:12 +0000 |
|---|---|---|
| committer | cookedm <cookedm@localhost> | 2006-02-21 23:09:12 +0000 |
| commit | ede85cec1879d0d18a797749ccf7fc1853a2146e (patch) | |
| tree | 450ae37baa762c4357125e428d185aedb8105ac9 /numpy/distutils/ccompiler.py | |
| parent | bb23ed753f0548e79bf3371cc7c6a3ec81187bb4 (diff) | |
| parent | 0aa85cabe66a188a409e51e04186a050ba6d2d79 (diff) | |
| download | numpy-ede85cec1879d0d18a797749ccf7fc1853a2146e.tar.gz | |
Merge trunk (r2124:2142) to power optimization branch
Diffstat (limited to 'numpy/distutils/ccompiler.py')
| -rw-r--r-- | numpy/distutils/ccompiler.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index f865416b3..efd458897 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -10,7 +10,7 @@ from distutils.version import LooseVersion import log from exec_command import exec_command -from misc_util import cyg2win32, is_sequence +from misc_util import cyg2win32, is_sequence, mingw32 from distutils.spawn import _nt_quote_args # Using customized CCompiler.spawn. @@ -235,8 +235,7 @@ if sys.platform == 'win32': compiler_class['mingw32'] = ('mingw32ccompiler', 'Mingw32CCompiler', "Mingw32 port of GNU C Compiler for Win32"\ "(for MSC built Python)") - if os.environ.get('OSTYPE','')=='msys' or \ - os.environ.get('MSYSTEM','')=='MINGW32': + if mingw32(): # On windows platforms, we want to default to mingw32 (gcc) # because msvc can't build blitz stuff. log.info('Setting mingw32 as default compiler for nt.') |