summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/spack/spack/compiler.py8
-rw-r--r--lib/spack/spack/compilers/gcc.py21
-rw-r--r--var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py14
-rw-r--r--var/spack/repos/builtin/packages/llvm-amdgpu/package.py13
-rw-r--r--var/spack/repos/builtin/packages/llvm-doe/package.py12
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py12
6 files changed, 45 insertions, 35 deletions
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py
index 1e50749730..2e86309699 100644
--- a/lib/spack/spack/compiler.py
+++ b/lib/spack/spack/compiler.py
@@ -537,6 +537,14 @@ class Compiler(object):
)
return self.extract_version_from_output(output)
+ @property
+ def prefix(self):
+ """Query the compiler for its install prefix. This is the install
+ path as reported by the compiler. Note that paths for cc, cxx, etc
+ are not enough to find the install prefix of the compiler, since
+ the can be symlinks, wrappers, or filenames instead of absolute paths."""
+ raise NotImplementedError("prefix is not implemented for this compiler")
+
#
# Compiler classes have methods for querying the version of
# specific compiler executables. This is used when discovering compilers.
diff --git a/lib/spack/spack/compilers/gcc.py b/lib/spack/spack/compilers/gcc.py
index 011646c408..1b6eeaaa10 100644
--- a/lib/spack/spack/compilers/gcc.py
+++ b/lib/spack/spack/compilers/gcc.py
@@ -6,8 +6,11 @@
import os
import re
+from llnl.util.filesystem import ancestor
+
import spack.compiler
import spack.compilers.apple_clang as apple_clang
+import spack.util.executable
from spack.version import ver
@@ -196,3 +199,21 @@ class Gcc(spack.compiler.Compiler):
@property
def stdcxx_libs(self):
return ("-lstdc++",)
+
+ @property
+ def prefix(self):
+ # GCC reports its install prefix when running ``-print-search-dirs``
+ # on the first line ``install: <prefix>``.
+ cc = spack.util.executable.Executable(self.cc)
+ with self.compiler_environment():
+ gcc_output = cc("-print-search-dirs", output=str, error=str)
+
+ for line in gcc_output.splitlines():
+ if line.startswith("install:"):
+ gcc_prefix = line.split(":")[1].strip()
+ # Go from <prefix>/lib/gcc/<triplet>/<version>/ to <prefix>
+ return ancestor(gcc_prefix, 4)
+
+ raise RuntimeError(
+ "could not find install prefix of GCC from output:\n\t{}".format(gcc_output)
+ )
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
index a4e85c77de..7f601fc3d1 100644
--- a/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
+++ b/var/spack/repos/builtin/packages/intel-oneapi-compilers/package.py
@@ -5,6 +5,7 @@
import platform
+import spack.compilers
from spack.build_environment import dso_suffix
from spack.package import *
@@ -113,6 +114,15 @@ class IntelOneapiCompilers(IntelOneApiPackage):
depends_on("patchelf", type="build")
+ # TODO: effectively gcc is a direct dependency of intel-oneapi-compilers, but we
+ # cannot express that properly. For now, add conflicts for non-gcc compilers
+ # instead.
+ for __compiler in spack.compilers.supported_compilers():
+ if __compiler != "gcc":
+ conflicts(
+ "%{0}".format(__compiler), msg="intel-oneapi-compilers must be installed with %gcc"
+ )
+
if platform.system() == "Linux":
for v in linux_versions:
version(v["version"], expand=False, **v["cpp"])
@@ -186,7 +196,9 @@ class IntelOneapiCompilers(IntelOneApiPackage):
# TODO: it is unclear whether we should really use all elements of
# _ld_library_path because it looks like the only rpath that needs to be
# injected is self.component_prefix.linux.compiler.lib.intel64_lin.
- flags = " ".join(["-Wl,-rpath,{0}".format(d) for d in self._ld_library_path()])
+ flags_list = ["-Wl,-rpath,{}".format(d) for d in self._ld_library_path()]
+ flags_list.append("--gcc-toolchain={}".format(self.compiler.prefix))
+ flags = " ".join(flags_list)
for cmp in [
"icx",
"icpx",
diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
index f6192e6080..6002351a64 100644
--- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
+++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py
@@ -234,18 +234,7 @@ class LlvmAmdgpu(CMakePackage):
# Get the GCC prefix for LLVM.
if self.compiler.name == "gcc":
- compiler = Executable(self.compiler.cc)
- gcc_output = compiler("-print-search-dirs", output=str, error=str)
-
- gcc_prefix = ""
- for line in gcc_output.splitlines():
- if line.startswith("install:"):
- # Get path and strip any whitespace
- # (causes oddity with ancestor)
- gcc_prefix = line.split(":")[1].strip()
- gcc_prefix = ancestor(gcc_prefix, 4)
- break
- args.append(self.define("GCC_INSTALL_PREFIX", gcc_prefix))
+ args.append(self.define("GCC_INSTALL_PREFIX", self.compiler.prefix))
return args
diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py
index 29bdc912b7..e2ec14fa0d 100644
--- a/var/spack/repos/builtin/packages/llvm-doe/package.py
+++ b/var/spack/repos/builtin/packages/llvm-doe/package.py
@@ -582,17 +582,7 @@ class LlvmDoe(CMakePackage, CudaPackage):
cmake_args.append("-DLIBOMP_USE_ARGOBOTS=ON")
if self.compiler.name == "gcc":
- compiler = Executable(self.compiler.cc)
- gcc_output = compiler("-print-search-dirs", output=str, error=str)
-
- for line in gcc_output.splitlines():
- if line.startswith("install:"):
- # Get path and strip any whitespace
- # (causes oddity with ancestor)
- gcc_prefix = line.split(":")[1].strip()
- gcc_prefix = ancestor(gcc_prefix, 4)
- break
- cmake_args.append(define("GCC_INSTALL_PREFIX", gcc_prefix))
+ cmake_args.append(define("GCC_INSTALL_PREFIX", self.compiler.prefix))
# if spec.satisfies("platform=cray") or spec.satisfies("platform=linux"):
# cmake_args.append("-DCMAKE_BUILD_WITH_INSTALL_RPATH=1")
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 5751629f5f..d7958bd6f8 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -721,17 +721,7 @@ class Llvm(CMakePackage, CudaPackage):
cmake_args.append(from_variant("LIBOMP_TSAN_SUPPORT", "omp_tsan"))
if self.compiler.name == "gcc":
- compiler = Executable(self.compiler.cc)
- gcc_output = compiler("-print-search-dirs", output=str, error=str)
-
- for line in gcc_output.splitlines():
- if line.startswith("install:"):
- # Get path and strip any whitespace
- # (causes oddity with ancestor)
- gcc_prefix = line.split(":")[1].strip()
- gcc_prefix = ancestor(gcc_prefix, 4)
- break
- cmake_args.append(define("GCC_INSTALL_PREFIX", gcc_prefix))
+ cmake_args.append(define("GCC_INSTALL_PREFIX", self.compiler.prefix))
if self.spec.satisfies("~code_signing platform=darwin"):
cmake_args.append(define("LLDB_USE_SYSTEM_DEBUGSERVER", True))
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-29 04:29:11 +0000