diff options
| author | Dave Keeshan <96727608+davekeeshan@users.noreply.github.com> | 2023-11-28 01:16:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-27 18:16:03 -0700 |
| commit | ed543594545f6943224f1f27e0325f4bd5e2e1cd (patch) | |
| tree | 0bcd738a2a028ab4e3c96f3b9336c141e2c1e68c | |
| parent | ea610d3fe2fec4cab401a405f9949a26a06a5d32 (diff) | |
| download | spack-ed543594545f6943224f1f27e0325f4bd5e2e1cd.tar.gz spack-ed543594545f6943224f1f27e0325f4bd5e2e1cd.tar.bz2 spack-ed543594545f6943224f1f27e0325f4bd5e2e1cd.tar.xz spack-ed543594545f6943224f1f27e0325f4bd5e2e1cd.zip | |
Move compiler renaming to filter_compiler_wrappers (#41275)
| -rw-r--r-- | var/spack/repos/builtin/packages/verilator/package.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 0890517560..df49bf3bb6 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -75,6 +75,10 @@ class Verilator(AutotoolsPackage): depends_on("perl", type=("build", "run")) depends_on("bash", type="build") + # we need to fix the CXX and LINK paths, as they point to the spack + # wrapper scripts which aren't usable without spack + filter_compiler_wrappers("verilated.mk", relative_root="include") + def setup_run_environment(self, env): env.prepend_path("VERILATOR_ROOT", self.prefix) @@ -87,18 +91,3 @@ class Verilator(AutotoolsPackage): def install_include(self): install_tree("include", prefix.include) install_tree("bin", prefix.bin) - - # we need to fix the CXX and LINK paths, as they point to the spack - # wrapper scripts which aren't usable without spack - @run_after("install") - def patch_cxx(self): - filter_file( - r"^CXX\s*=.*", - f"CXX={self.compiler.cxx}", - join_path(self.prefix.include, "verilated.mk"), - ) - filter_file( - r"^LINK\s*=.*", - f"LINK={self.compiler.cxx}", - join_path(self.prefix.include, "verilated.mk"), - ) |