Skip to content
Snippets Groups Projects
Commit 592df25a authored by Gregory L. Lee's avatar Gregory L. Lee Committed by Todd Gamblin
Browse files

build fixes for openblas (#2601)

* build fixes for openblas

* avx2 in openblas nnot supported with older gcc

* merge fix for openblas
parent 0ef55b83
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,8 @@ class Openblas(MakefilePackage): ...@@ -55,6 +55,8 @@ class Openblas(MakefilePackage):
# https://github.com/xianyi/OpenBLAS/pull/915 # https://github.com/xianyi/OpenBLAS/pull/915
patch('openblas_icc.patch', when='%intel') patch('openblas_icc.patch', when='%intel')
parallel = False
@property @property
def blas_libs(self): def blas_libs(self):
shared = True if '+shared' in self.spec else False shared = True if '+shared' in self.spec else False
...@@ -90,11 +92,14 @@ def make_defs(self): ...@@ -90,11 +92,14 @@ def make_defs(self):
# When mixing compilers make sure that # When mixing compilers make sure that
# $SPACK_ROOT/lib/spack/env/<compiler> have symlinks with reasonable # $SPACK_ROOT/lib/spack/env/<compiler> have symlinks with reasonable
# names and hack them inside lib/spack/spack/compilers/<compiler>.py # names and hack them inside lib/spack/spack/compilers/<compiler>.py
make_defs = [ make_defs = [
'CC={0}'.format(spack_cc), 'CC={0}'.format(spack_cc),
'FC={0}'.format(spack_f77), 'FC={0}'.format(spack_f77),
'MAKE_NO_J=1' 'MAKE_NO_J=1'
] ]
if self.spec.satisfies('%gcc@:4.8.4'):
make_defs += ['NO_AVX2=1']
if '~shared' in self.spec: if '~shared' in self.spec:
if '+pic' in self.spec: if '+pic' in self.spec:
make_defs.extend([ make_defs.extend([
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment