From c0342e41521110a3c1d784678f83d262e54a30df Mon Sep 17 00:00:00 2001 From: Jim Galarowicz Date: Thu, 13 Aug 2020 15:41:20 -0500 Subject: Update the change to add gomp compatibity to llvm-openmp. (#17400) * Update the change to add gomp compatibity to llvm-openmp. * Update the change to add gomp compatibity to llvm-openmp using append instead of extend. * Fix flake8 issue. Co-authored-by: Jim Galarowicz --- var/spack/repos/builtin/packages/llvm-openmp/package.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) mode change 100644 => 100755 var/spack/repos/builtin/packages/llvm-openmp/package.py (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm-openmp/package.py b/var/spack/repos/builtin/packages/llvm-openmp/package.py old mode 100644 new mode 100755 index 166b0c7a6e..831a32f745 --- a/var/spack/repos/builtin/packages/llvm-openmp/package.py +++ b/var/spack/repos/builtin/packages/llvm-openmp/package.py @@ -18,10 +18,20 @@ class LlvmOpenmp(CMakePackage): depends_on('cmake@2.8:', type='build') + variant('multicompat', default=False, + description="Support gomp and the Intel openMP runtime library.") + def cmake_args(self): + # Disable LIBOMP_INSTALL_ALIASES, otherwise the library is installed as # libgomp alias which can conflict with GCC's libgomp. - return ['-DLIBOMP_INSTALL_ALIASES=OFF'] + cmake_args = [ + '-DLIBOMP_INSTALL_ALIASES=OFF' + ] + # Add optional support for both Intel and gcc compilers + if self.spec.satisfies('+multicompat'): + cmake_args.append('-DKMP_GOMP_COMPAT=1') + return cmake_args @property def libs(self): -- cgit v1.2.3-60-g2f50