summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/blis/package.py4
-rw-r--r--var/spack/repos/builtin/packages/hpl/package.py12
2 files changed, 12 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/blis/package.py b/var/spack/repos/builtin/packages/blis/package.py
index c2fc1545a3..fd06bc455e 100644
--- a/var/spack/repos/builtin/packages/blis/package.py
+++ b/var/spack/repos/builtin/packages/blis/package.py
@@ -104,7 +104,9 @@ class BlisBase(Package):
@property
def libs(self):
- return find_libraries(['libblis'], root=self.prefix, recursive=True)
+ return find_libraries(
+ ["libblis", "libblis-mt"], root=self.prefix, recursive=True
+ )
class Blis(BlisBase):
diff --git a/var/spack/repos/builtin/packages/hpl/package.py b/var/spack/repos/builtin/packages/hpl/package.py
index 05909653c0..579abe7618 100644
--- a/var/spack/repos/builtin/packages/hpl/package.py
+++ b/var/spack/repos/builtin/packages/hpl/package.py
@@ -101,9 +101,15 @@ class Hpl(AutotoolsPackage):
@when('@2.3:')
def configure_args(self):
- config = [
- 'CFLAGS=-O3'
- ]
+ filter_file(
+ r"^libs10=.*", "libs10=%s" % self.spec["blas"].libs.ld_flags,
+ "configure"
+ )
+
+ if '+openmp' in self.spec:
+ config = ['CFLAGS=-O3 ' + self.compiler.openmp_flag]
+ else:
+ config = ['CFLAGS=-O3']
if (self.spec.satisfies('^intel-mkl') or
self.spec.satisfies('^intel-parallel-studio+mkl')):