diff options
| author | mbyt <random.seed@web.de> | 2015-01-06 06:51:37 +0100 |
|---|---|---|
| committer | mbyt <random.seed@web.de> | 2015-01-06 06:51:37 +0100 |
| commit | ed83ae77ebd92e6008c4e133d1dead56d8f575fb (patch) | |
| tree | d81a675681dc0a2fb59dd45784753b3853b81521 | |
| parent | 1cb9cf2429165660a40eb499b392b3a6133cdd34 (diff) | |
| download | numpy-ed83ae77ebd92e6008c4e133d1dead56d8f575fb.tar.gz | |
BLD: ensure OPT link environment variable is read
| -rw-r--r-- | numpy/distutils/unixccompiler.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py index 9e49edadc..a92ccd3e7 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py @@ -32,13 +32,16 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts self.compiler_so = ccomp # ensure OPT environment variable is read if 'OPT' in os.environ: + from distutils.sysconfig import get_config_vars opt = " ".join(os.environ['OPT'].split()) - ccomp_s = " ".join(ccomp) + gcv_opt = " ".join(get_config_vars('OPT')[0].split()) + ccomp_s = " ".join(self.compiler_so) if opt not in ccomp_s: - from distutils.sysconfig import get_config_vars - gcv_opt = " ".join(get_config_vars('OPT')[0].split()) ccomp_s = ccomp_s.replace(gcv_opt, opt) self.compiler_so = ccomp_s.split() + llink_s = " ".join(self.linker_so) + if opt not in llink_s: + self.linker_so = llink_s.split() + opt.split() display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) try: |