From ea610d3fe2fec4cab401a405f9949a26a06a5d32 Mon Sep 17 00:00:00 2001 From: Dave Keeshan <96727608+davekeeshan@users.noreply.github.com> Date: Tue, 28 Nov 2023 00:44:44 +0000 Subject: iverilog-vpi: filter compiler wrappers from a few files (#41244) --- var/spack/repos/builtin/packages/icarus/package.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/var/spack/repos/builtin/packages/icarus/package.py b/var/spack/repos/builtin/packages/icarus/package.py index b290cd9fed..d81f7e6fb4 100644 --- a/var/spack/repos/builtin/packages/icarus/package.py +++ b/var/spack/repos/builtin/packages/icarus/package.py @@ -13,6 +13,9 @@ class Icarus(AutotoolsPackage): url = "https://github.com/steveicarus/iverilog/archive/refs/tags/v12_0.tar.gz" git = "https://github.com/steveicarus/iverilog.git" + maintainers("davekeeshan") + + version("master", branch="master") version("12_0", sha256="a68cb1ef7c017ef090ebedb2bc3e39ef90ecc70a3400afb4aa94303bc3beaa7d") version("11_0", sha256="6327fb900e66b46803d928b7ca439409a0dc32731d82143b20387be0833f1c95") version("10_3", commit="453c5465895eaca4a792d18b75e9ec14db6ea50e") @@ -38,3 +41,14 @@ class Icarus(AutotoolsPackage): mkdirp(join_path(prefix.lib, "ivl", "include")) mkdirp(join_path(prefix.share, "man")) mkdirp(join_path(prefix.share, "man", "man1")) + + # We need to fix the CC and CXX paths, as they point to the spack + # wrapper scripts which aren't usable without spack + @run_after("install") + def patch_compiler(self): + filter_file( + r"^CC\s*=.*", f"CC={self.compiler.cc}", join_path(self.prefix.bin, "iverilog-vpi") + ) + filter_file( + r"^CXX\s*=.*", f"CXX={self.compiler.cxx}", join_path(self.prefix.bin, "iverilog-vpi") + ) -- cgit v1.2.3-60-g2f50