diff options
| author | Thomas Green <tomgreen66@hotmail.com> | 2021-01-15 08:22:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 09:22:58 +0100 |
| commit | 58d5b73ba4111ee1abd9d668086b2b2aa17fcf16 (patch) | |
| tree | 7d54b57a2d30195a89ea7433a3d17bbaa35e4be6 | |
| parent | 56904d58343c419f74576141b4ce16f8fbbdfae5 (diff) | |
| download | spack-58d5b73ba4111ee1abd9d668086b2b2aa17fcf16.tar.gz spack-58d5b73ba4111ee1abd9d668086b2b2aa17fcf16.tar.bz2 spack-58d5b73ba4111ee1abd9d668086b2b2aa17fcf16.tar.xz spack-58d5b73ba4111ee1abd9d668086b2b2aa17fcf16.zip | |
Improve gcc detection in llvm. (#20189)
Co-authored-by: Tom Scogland <tom.scogland@gmail.com>
Co-authored-by: Thomas Green <ca-tgreen@gw4a64fxlogin00.head.gw4.metoffice.gov.uk>
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 14433c1aa1..1f9f4c8313 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -499,7 +499,16 @@ class Llvm(CMakePackage, CudaPackage): cmake_args.append("-DLIBOMP_TSAN_SUPPORT=ON") if self.compiler.name == "gcc": - gcc_prefix = ancestor(self.compiler.cc, 2) + 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("-DGCC_INSTALL_PREFIX=" + gcc_prefix) if spec.satisfies("@4.0.0:"): |