Merge branch 'eschnett-eschnett/boost-mpi-osx' into develop
This commit is contained in:
commit
e0fdb34104
@ -2,6 +2,9 @@
|
|||||||
import spack
|
import spack
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
class Boost(Package):
|
class Boost(Package):
|
||||||
"""Boost provides free peer-reviewed portable C++ source
|
"""Boost provides free peer-reviewed portable C++ source
|
||||||
libraries, emphasizing libraries that work well with the C++
|
libraries, emphasizing libraries that work well with the C++
|
||||||
@ -173,6 +176,16 @@ def determine_b2_options(self, spec, options):
|
|||||||
return threadingOpts
|
return threadingOpts
|
||||||
|
|
||||||
def install(self, spec, prefix):
|
def install(self, spec, prefix):
|
||||||
|
# On Darwin, Boost expects the Darwin libtool. However, one of the
|
||||||
|
# dependencies may have pulled in Spack's GNU libtool, and these two are
|
||||||
|
# not compatible. We thus create a symlink to Darwin's libtool and add
|
||||||
|
# it at the beginning of PATH.
|
||||||
|
if sys.platform == 'darwin':
|
||||||
|
newdir = os.path.abspath('darwin-libtool')
|
||||||
|
mkdirp(newdir)
|
||||||
|
force_symlink('/usr/bin/libtool', join_path(newdir, 'libtool'))
|
||||||
|
env['PATH'] = newdir + ':' + env['PATH']
|
||||||
|
|
||||||
withLibs = list()
|
withLibs = list()
|
||||||
for lib in Boost.all_libs:
|
for lib in Boost.all_libs:
|
||||||
if "+{0}".format(lib) in spec:
|
if "+{0}".format(lib) in spec:
|
||||||
|
Loading…
Reference in New Issue
Block a user