diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-09-10 23:24:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 23:24:26 -0500 |
| commit | 86d8c55470a0100e98b7c453c1cac16bc560e6f0 (patch) | |
| tree | 5b993e0cc3e13e6f5e6d831f9ab7ef40607a2044 /pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch | |
| parent | 95eabdfd5f6197c83e9e5f53ddb65dbbea3c13fd (diff) | |
| parent | 61517de024cc9e61c18f2434656c18067a2d68a4 (diff) | |
| download | nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.gz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.bz2 nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.lz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.xz nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.tar.zst nixpkgs-86d8c55470a0100e98b7c453c1cac16bc560e6f0.zip | |
Merge branch 'staging' into ios-13
Diffstat (limited to 'pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch')
| -rw-r--r-- | pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch b/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch new file mode 100644 index 00000000000..b2626ea26e5 --- /dev/null +++ b/pkgs/development/python-modules/numpy/numpy-distutils-C++_1.16.patch @@ -0,0 +1,30 @@ +diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py +--- 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 + 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) +- + # 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 + deps = [] + + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + +- extra_postargs, display = display) ++ if self.detect_language(src) == 'c++': ++ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + ++ extra_postargs, display = display) ++ else: ++ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + ++ extra_postargs, display = display) ++ + except DistutilsExecError: + msg = str(get_exception()) + raise CompileError(msg) |