at 18.03-beta 1.5 kB view raw
1diff --git a/numpy/distutils/unixccompiler.py b/numpy/distutils/unixccompiler.py 2index 6ed5eec..82a88b5 100644 3--- a/numpy/distutils/unixccompiler.py 4+++ b/numpy/distutils/unixccompiler.py 5@@ -44,8 +44,6 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts 6 if opt not in llink_s: 7 self.linker_so = llink_s.split() + opt.split() 8 9- display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) 10- 11 # gcc style automatic dependencies, outputs a makefile (-MF) that lists 12 # all headers needed by a c file as a side effect of compilation (-MMD) 13 if getattr(self, '_auto_depends', False): 14@@ -54,8 +52,15 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts 15 deps = [] 16 17 try: 18- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + 19- extra_postargs, display = display) 20+ if self.detect_language(src) == 'c++': 21+ display = '%s: %s' % (os.path.basename(self.compiler_so_cxx[0]), src) 22+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + deps + 23+ extra_postargs, display = display) 24+ else: 25+ display = '%s: %s' % (os.path.basename(self.compiler_so[0]), src) 26+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + deps + 27+ extra_postargs, display = display) 28+ 29 except DistutilsExecError: 30 msg = str(get_exception()) 31 raise CompileError(msg)