Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions repos/spack_repo/builtin/packages/bzip2/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,12 @@ def patch(self):
if self.spec.satisfies("platform=windows"):
return

# 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={0}".format(spack_cc), "Makefile")
filter_file(r"^CC=gcc", "CC={0}".format(spack_cc), "Makefile-libbz2_so")
# bzip2 comes with two separate Makefiles for static and dynamic builds.
# Tell both to use the configured C compiler instead of GCC. `spack_cc`
# is no longer injected as a package-module global during this phase.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested and spack_cc is still set and it and is documented in the spack documenation:

https://spack.readthedocs.io/en/latest/build_systems/makefilepackage.html#edit-makefile

So far, I was unable to find evidence that this change should be merged.

cc = self.compiler.cc
filter_file(r"^CC=gcc", "CC={0}".format(cc), "Makefile")
filter_file(r"^CC=gcc", "CC={0}".format(cc), "Makefile-libbz2_so")

# The Makefiles use GCC flags that are incompatible with PGI
if self.spec.satisfies("%nvhpc@:20.11"):
Expand Down
Loading