From ed543594545f6943224f1f27e0325f4bd5e2e1cd Mon Sep 17 00:00:00 2001 From: Dave Keeshan <96727608+davekeeshan@users.noreply.github.com> Date: Tue, 28 Nov 2023 01:16:03 +0000 Subject: Move compiler renaming to filter_compiler_wrappers (#41275) --- var/spack/repos/builtin/packages/verilator/package.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'var') 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"), - ) -- cgit v1.2.3-70-g09d2