diff options
| -rw-r--r-- | numpy/distutils/command/build_clib.py | 22 | ||||
| -rw-r--r-- | numpy/distutils/command/build_ext.py | 4 | ||||
| -rw-r--r-- | numpy/distutils/command/config.py | 7 |
3 files changed, 18 insertions, 15 deletions
diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 973f21d1a..ae6004db3 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -78,14 +78,15 @@ class build_clib(old_build_clib): dry_run=self.dry_run, force=self.force, requiref90='f90' in languages) - self.fcompiler.customize(self.distribution) + if self.compiler is not None: + self.fcompiler.customize(self.distribution) - libraries = self.libraries - self.libraries = None - self.fcompiler.customize_cmd(self) - self.libraries = libraries + libraries = self.libraries + self.libraries = None + self.fcompiler.customize_cmd(self) + self.libraries = libraries - self.fcompiler.show_customization() + self.fcompiler.show_customization() self.build_libraries(self.libraries) @@ -143,10 +144,11 @@ class build_clib(old_build_clib): dry_run=self.dry_run, force=self.force, requiref90=requiref90) - dist = self.distribution - base_config_fc = dist.get_option_dict('config_fc').copy() - base_config_fc.update(config_fc) - fcompiler.customize(base_config_fc) + if fcompiler is not None: + dist = self.distribution + base_config_fc = dist.get_option_dict('config_fc').copy() + base_config_fc.update(config_fc) + fcompiler.customize(base_config_fc) # check availability of Fortran compilers if (f_sources or fmodule_sources) and fcompiler is None: diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 6febe9124..83779fe49 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -175,7 +175,7 @@ class build_ext (old_build_ext): force=self.force, requiref90=False) fcompiler = self._f77_compiler - if fcompiler.get_version(): + if fcompiler and fcompiler.get_version(): fcompiler.customize(self.distribution) fcompiler.customize_cmd(self) fcompiler.show_customization() @@ -194,7 +194,7 @@ class build_ext (old_build_ext): force=self.force, requiref90=True) fcompiler = self._f90_compiler - if fcompiler.get_version(): + if fcompiler and fcompiler.get_version(): fcompiler.customize(self.distribution) fcompiler.customize_cmd(self) fcompiler.show_customization() diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index f4e96664c..86f4bf593 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -28,9 +28,10 @@ class config(old_config): if not isinstance(self.fcompiler, FCompiler): self.fcompiler = new_fcompiler(compiler=self.fcompiler, dry_run=self.dry_run, force=1) - self.fcompiler.customize(self.distribution) - self.fcompiler.customize_cmd(self) - self.fcompiler.show_customization() + if self.fcompiler is not None: + self.fcompiler.customize(self.distribution) + self.fcompiler.customize_cmd(self) + self.fcompiler.show_customization() def _wrap_method(self,mth,lang,args): from distutils.ccompiler import CompileError |