diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-09-09 00:48:13 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-09-09 00:48:13 +0000 |
| commit | 2d078a1432687fab8c0626ed22b518b688950313 (patch) | |
| tree | 5d9c80b0793feda1fe6800e50a3a847641c07cfe /numpy/distutils/command/scons.py | |
| parent | d00fe700a1a0c9a0948a268a0a2145d54b673c0b (diff) | |
| download | numpy-2d078a1432687fab8c0626ed22b518b688950313.tar.gz | |
Do not pass compiler path options to scons if they were not set.
Diffstat (limited to 'numpy/distutils/command/scons.py')
| -rw-r--r-- | numpy/distutils/command/scons.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/numpy/distutils/command/scons.py b/numpy/distutils/command/scons.py index f7fe89377..69721fb6a 100644 --- a/numpy/distutils/command/scons.py +++ b/numpy/distutils/command/scons.py @@ -494,17 +494,20 @@ class scons(old_build_ext): if not self._bypass_distutils_cc: cmd.append('cc_opt=%s' % self.scons_compiler) - cmd.append('cc_opt_path=%s' % self.scons_compiler_path) + if self.scons_compiler_path: + cmd.append('cc_opt_path=%s' % self.scons_compiler_path) else: cmd.append('cc_opt=%s' % self.scons_compiler) if self.scons_fcompiler: cmd.append('f77_opt=%s' % self.scons_fcompiler) - cmd.append('f77_opt_path=%s' % protect_path(self.scons_fcompiler_path)) + if self.scons_fcompiler_path: + cmd.append('f77_opt_path=%s' % protect_path(self.scons_fcompiler_path)) if self.scons_cxxcompiler: cmd.append('cxx_opt=%s' % self.scons_cxxcompiler) - cmd.append('cxx_opt_path=%s' % protect_path(self.scons_cxxcompiler_path)) + if self.scons_cxxcompiler_path: + cmd.append('cxx_opt_path=%s' % protect_path(self.scons_cxxcompiler_path)) cmd.append('include_bootstrap=%s' % dirl_to_str(get_numpy_include_dirs(sconscript))) if self.silent: |