diff options
| author | Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> | 2022-09-29 13:58:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 07:58:05 -0400 |
| commit | 19faeab84dca8377e45498f4ffa7014bb6757146 (patch) | |
| tree | 3fb96f9e6f720c82e799fde22ce8a6988632c922 | |
| parent | 42a230eef17049f572c64ac729dd6458f5afcc8f (diff) | |
| download | spack-19faeab84dca8377e45498f4ffa7014bb6757146.tar.gz spack-19faeab84dca8377e45498f4ffa7014bb6757146.tar.bz2 spack-19faeab84dca8377e45498f4ffa7014bb6757146.tar.xz spack-19faeab84dca8377e45498f4ffa7014bb6757146.zip | |
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
| -rw-r--r-- | var/spack/repos/builtin/packages/intel-oneapi-compilers-classic/package.py | 29 |
1 files changed, 8 insertions, 21 deletions
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) |