From 30cf665d162f08fb6fbe547f2b8279170a389950 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Sun, 11 Aug 2019 12:57:31 -0500 Subject: Fix py-matplotlib build with Intel compiler (#12144) Not sure what happened between #5321 and now but the CC=CXX fix now prevents py-matplotlib from building with the Intel compiler. I verified with versions of py-matplotlib from 2.0.2 to 3.0.2 and intel-17.0.4 and 19.0.4 that py-matplotlib successfully builds with the Intel compiler without that code. --- var/spack/repos/builtin/packages/py-matplotlib/package.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-matplotlib/package.py b/var/spack/repos/builtin/packages/py-matplotlib/package.py index df552de40a..36d1f5254b 100644 --- a/var/spack/repos/builtin/packages/py-matplotlib/package.py +++ b/var/spack/repos/builtin/packages/py-matplotlib/package.py @@ -130,11 +130,6 @@ class PyMatplotlib(PythonPackage): # Patch to pick up correct freetype headers patch('freetype-include-path.patch', when='@2.2.2:2.9.9') - @run_before('build') - def set_cc(self): - if self.spec.satisfies('%intel'): - env['CC'] = spack_cxx - @run_before('build') def set_backend(self): """Set build options with regards to backend GUI libraries.""" -- cgit v1.2.3-70-g09d2