Commit fb7c9489 authored by Joubert, Wayne's avatar Joubert, Wayne
Browse files

scalapack small adjustments.

parent 7d40699b
......@@ -379,12 +379,10 @@ def make_binary(build_dir_path, test):
['NOOPT = -O0', 'NOOPT = -O0 -compiler gnu'],
['FCLOADFLAGS = ..FCFLAGS.',
'FCLOADFLAGS = $(FCFLAGS) ' +
('-Wl,-z,muldefs ' + ' -lgfortran ' + esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['CCLOADFLAGS = ..CCFLAGS.',
'CCLOADFLAGS = $(CCFLAGS) ' +
('-Wl,-z,muldefs ' + ' -lgfortran ' + esslflags + ' ' + laflags
('-Wl,-z,muldefs -Wl,-Map,out_linkmap.txt ' + ' -lgfortran ' +
esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['CCLOADFLAGS = ..CCFLAGS.', 'CCLOADFLAGS = $(FCLOADFLAGS)'],
['BLASLIB = -lblas',
'BLASLIB = ' +
('-lessl -lblas' if use_syslapack(test) else '-lblas')],
......@@ -441,12 +439,10 @@ def make_binary(build_dir_path, test):
'FCLOADER = pgf90'],
['FCLOADFLAGS = ..FCFLAGS.',
'FCLOADFLAGS = $(FCFLAGS) ' +
('-Wl,-z,muldefs ' + ldflags + ' ' + esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['CCLOADFLAGS = ..CCFLAGS.',
'CCLOADFLAGS = $(CCFLAGS) ' +
('-Wl,-z,muldefs ' + ldflags + ' ' + esslflags + ' ' + laflags
('-Wl,-z,muldefs -Wl,-Map,out_linkmap.txt ' + ldflags + ' ' +
esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['CCLOADFLAGS = ..CCFLAGS.', 'CCLOADFLAGS = $(FCLOADFLAGS)'],
['BLASLIB = -lblas',
'BLASLIB = ' +
('-lessl -lblas' if use_syslapack(test) else '-lblas')],
......@@ -483,12 +479,10 @@ def make_binary(build_dir_path, test):
'NOOPT = -O0 -compiler xlf95 -qfixed -qnosave'],
['FCLOADFLAGS = ..FCFLAGS.',
'FCLOADFLAGS = $(FCFLAGS) -qnosave ' +
('-Wl,-z,muldefs ' + ' -lgfortran ' + esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['CCLOADFLAGS = ..CCFLAGS.',
'CCLOADFLAGS = $(CCFLAGS) -qnosave ' +
('-Wl,-z,muldefs ' + ' -lgfortran ' + esslflags + ' ' + laflags
('-Wl,-z,muldefs -Wl,-Map,out_linkmap.txt ' + ' -lgfortran ' +
esslflags + ' ' + laflags
if use_syslapack(test) else laflags)],
['CCLOADFLAGS = ..CCFLAGS.', 'CCLOADFLAGS = $(FCLOADFLAGS)'],
['BLASLIB = -lblas',
'BLASLIB = ' +
('-lessl -lblas' if use_syslapack(test) else '-lblas')],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment