From abd7b185f7114438e02cf2b129215467a9fb9941 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 16 Nov 2018 19:25:15 +0100 Subject: intel-mkl: fix usage of openmp_libs and tbb_libs (#9863) * intel-mkl: fix usage of openmp_libs and tbb_libs * intel-mkl: remove trailing whitespace from openmp lib --- lib/spack/spack/build_systems/intel.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py index fcab73e0a1..10503f3f7d 100644 --- a/lib/spack/spack/build_systems/intel.py +++ b/lib/spack/spack/build_systems/intel.py @@ -674,7 +674,7 @@ class IntelPackage(PackageBase): gcc = Executable(self.compiler.cc) omp_lib_path = gcc( '--print-file-name', 'libgomp.%s' % dso_suffix, output=str) - omp_libs = LibraryList(omp_lib_path) + omp_libs = LibraryList(omp_lib_path.strip()) if len(omp_libs) < 1: raise_lib_error('Cannot locate OpenMP libraries:', omp_libnames) @@ -741,10 +741,10 @@ class IntelPackage(PackageBase): mkl_threading = 'libmkl_intel_thread' elif '%gcc' in self.spec: mkl_threading = 'libmkl_gnu_thread' - threading_engine_libs = self.openmp_libs() + threading_engine_libs = self.openmp_libs elif self.spec.satisfies('threads=tbb'): mkl_threading = 'libmkl_tbb_thread' - threading_engine_libs = self.tbb_libs() + threading_engine_libs = self.tbb_libs elif self.spec.satisfies('threads=none'): mkl_threading = 'libmkl_sequential' threading_engine_libs = LibraryList([]) -- cgit v1.2.3-70-g09d2