From 19faeab84dca8377e45498f4ffa7014bb6757146 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin Date: Thu, 29 Sep 2022 13:58:05 +0200 Subject: intel-oneapi-compilers-classic: extend setup_run_environment with the one from intel-oneapi-compilers (#32854) * intel-oneapi-compilers-classic: refactor setup_run_environment * intel-oneapi-compilers-classic: extend setup_run_environment with the one from intel-oneapi-compilers --- .../intel-oneapi-compilers-classic/package.py | 29 ++++++---------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py index 9e2fc38315..61b634fb9b 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py @@ -36,26 +36,13 @@ class IntelOneapiCompilersClassic(Package): depends_on("intel-oneapi-compilers@" + oneapi_ver, when="@" + ver, type="run") def setup_run_environment(self, env): - """Adds environment variables to the generated module file. + """Adds environment variables to the generated module file.""" + oneapi_pkg = self.spec["intel-oneapi-compilers"].package - These environment variables come from running: + oneapi_pkg.setup_run_environment(env) - .. code-block:: console - - $ source {prefix}/{component}/{version}/env/vars.sh - - and from setting CC/CXX/F77/FC - """ - - bin = join_path( - self.spec["intel-oneapi-compilers"].prefix, - "compiler", - self.spec["intel-oneapi-compilers"].version, - "linux", - "bin", - "intel64", - ) - env.set("CC", join_path(bin, "icc")) - env.set("CXX", join_path(bin, "icpc")) - env.set("F77", join_path(bin, "ifort")) - env.set("FC", join_path(bin, "ifort")) + bin_prefix = oneapi_pkg.component_prefix.linux.bin.intel64 + env.set("CC", bin_prefix.icc) + env.set("CXX", bin_prefix.icpc) + env.set("F77", bin_prefix.ifort) + env.set("FC", bin_prefix.ifort) -- cgit v1.2.3-70-g09d2