[MUMPS] When building '+shared' put the 'inject_libs' after the object
files to get proper linking - this was needed on Ubuntu 14.04.
This commit is contained in:
parent
6f0472ea87
commit
b1628f0af1
1 changed files with 10 additions and 2 deletions
|
@ -232,10 +232,18 @@ def write_makefile_inc(self):
|
||||||
else:
|
else:
|
||||||
makefile_conf.extend([
|
makefile_conf.extend([
|
||||||
'LIBEXT=.so',
|
'LIBEXT=.so',
|
||||||
'AR=$(FL) -shared -Wl,-soname -Wl,%s/$(notdir $@) %s -o' %
|
'AR=link_cmd() { $(FL) -shared -Wl,-soname '
|
||||||
|
'-Wl,%s/$(notdir $@) -o "$$@" %s; }; link_cmd ' %
|
||||||
(prefix.lib, inject_libs),
|
(prefix.lib, inject_libs),
|
||||||
'RANLIB=echo'
|
'RANLIB=ls'
|
||||||
])
|
])
|
||||||
|
# When building libpord, read AR from Makefile.inc instead of
|
||||||
|
# going through the make command line - this prevents various
|
||||||
|
# problems with the substring "$$@".
|
||||||
|
filter_file(' AR="\$\(AR\)"', '', 'Makefile')
|
||||||
|
filter_file('^(INCLUDES = -I../include)',
|
||||||
|
'\\1\ninclude ../../Makefile.inc',
|
||||||
|
join_path('PORD', 'lib', 'Makefile'))
|
||||||
|
|
||||||
if using_xl:
|
if using_xl:
|
||||||
# The patches for xl + spectrum-mpi use SAR for linking
|
# The patches for xl + spectrum-mpi use SAR for linking
|
||||||
|
|
Loading…
Reference in a new issue