diff options
author | Dave Keeshan <96727608+davekeeshan@users.noreply.github.com> | 2024-06-10 23:14:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-10 16:14:26 -0600 |
commit | c3567cb19975c97561b756ed51db0e5e7d917926 (patch) | |
tree | 2e5bf0de71b019a6020a8cbe4dbda0b35e28cdb8 | |
parent | ae4c1d11f7ac5565ab3437fbe42195e567cc36ad (diff) | |
download | spack-c3567cb19975c97561b756ed51db0e5e7d917926.tar.gz spack-c3567cb19975c97561b756ed51db0e5e7d917926.tar.bz2 spack-c3567cb19975c97561b756ed51db0e5e7d917926.tar.xz spack-c3567cb19975c97561b756ed51db0e5e7d917926.zip |
verilator: Some environment varibles are no longer required (#44655)
* verilator: Some environment varibles are no longer required
* Revert depends_on for flex back to the deafult case
* Use decorator, when, for setup_run_environment insdtead of if inside function
-rw-r--r-- | var/spack/repos/builtin/packages/verilator/package.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/verilator/package.py b/var/spack/repos/builtin/packages/verilator/package.py index 75a2e6cd3d..db00e7ddfc 100644 --- a/var/spack/repos/builtin/packages/verilator/package.py +++ b/var/spack/repos/builtin/packages/verilator/package.py @@ -76,15 +76,17 @@ class Verilator(AutotoolsPackage): depends_on("help2man", type="build") depends_on("bison", type="build") depends_on("flex") - depends_on("ccache", type=("build", "run"), when="@5.018:") depends_on("perl", type=("build", "run")) + depends_on("ccache", type=("build", "run"), when="@5.018:") conflicts("%gcc@:6", msg="C++14 support required") # 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") + filter_compiler_wrappers("verilated.mk", relative_root="share/verilator/include") + @when("@:5.022") def setup_run_environment(self, env): env.prepend_path("VERILATOR_ROOT", self.prefix) |