diff options
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch b/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch index 771da8cf3ff..6c75f34ce07 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch +++ b/nixpkgs/pkgs/development/python-modules/numpy/numpy-distutils-C++.patch @@ -1,8 +1,7 @@ diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py -index 6ed5eec..82a88b5 100644 --- a/numpy/distutils/unixccompiler.py +++ b/numpy/distutils/unixccompiler.py -@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts +@@ -37,8 +37,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts if opt not in llink_s: self.linker_so = llink_s.split() + opt.split() @@ -11,7 +10,7 @@ index 6ed5eec..82a88b5 100644 # gcc style automatic dependencies, outputs a makefile (-MF) that lists # all headers needed by a c file as a side effect of compilation (-MMD) if getattr(self, '_auto_depends', False): -@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts +@@ -47,8 +45,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts deps = [] try: @@ -26,6 +25,6 @@ index 6ed5eec..82a88b5 100644 + self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + + extra_postargs, display = display) + - except DistutilsExecError: - msg = str(get_exception()) + except DistutilsExecError as e: + msg = str(e) raise CompileError(msg) |