diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-01-26 09:52:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-26 09:52:04 +0100 |
| commit | 7cb43e3d057bf73ee1aa90914ced9399e25b9e86 (patch) | |
| tree | 928d9dd58cc794278fe9ca2cb069dda1dbeaedc3 /var | |
| parent | 1f39afe475c488066061526598df39f8f275e73e (diff) | |
| download | spack-7cb43e3d057bf73ee1aa90914ced9399e25b9e86.tar.gz spack-7cb43e3d057bf73ee1aa90914ced9399e25b9e86.tar.bz2 spack-7cb43e3d057bf73ee1aa90914ced9399e25b9e86.tar.xz spack-7cb43e3d057bf73ee1aa90914ced9399e25b9e86.zip | |
Bzip2 now uses 'spack_cc' as a compiler, instead of plain 'cc' (#7074)
Looking at build logs, it seems that prior to this commit bzip2 was
using 'cc', and relying on the PATH to be set correctly to find Spack
wrappers. This commit improves the robustness of the recipe, by using
the absolute path of the wrapper.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/bzip2/package.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/bzip2/package.py b/var/spack/repos/builtin/packages/bzip2/package.py index d44e97207f..53ed853310 100644 --- a/var/spack/repos/builtin/packages/bzip2/package.py +++ b/var/spack/repos/builtin/packages/bzip2/package.py @@ -51,8 +51,10 @@ class Bzip2(Package): def patch(self): # bzip2 comes with two separate Makefiles for static and dynamic builds # Tell both to use Spack's compiler wrapper instead of GCC - filter_file(r'^CC=gcc', 'CC=cc', 'Makefile') - filter_file(r'^CC=gcc', 'CC=cc', 'Makefile-libbz2_so') + filter_file(r'^CC=gcc', 'CC={0}'.format(spack_cc), 'Makefile') + filter_file( + r'^CC=gcc', 'CC={0}'.format(spack_cc), 'Makefile-libbz2_so' + ) # The Makefiles use GCC flags that are incompatible with PGI if self.compiler.name == 'pgi': |