summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-03-29 05:15:40 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-03-29 05:15:40 -0700
commite0fdb3410416f5a91aded450f1c92b01826210ea (patch)
treecc291fc36d76b178f6348eba68a93b59f0e02746 /var
parentb3a384e1d838d86eb82ab95ac81f7233891a3838 (diff)
parent62ae830e49a02b78e614b88ecf01a6ad70367301 (diff)
downloadspack-e0fdb3410416f5a91aded450f1c92b01826210ea.tar.gz
spack-e0fdb3410416f5a91aded450f1c92b01826210ea.tar.bz2
spack-e0fdb3410416f5a91aded450f1c92b01826210ea.tar.xz
spack-e0fdb3410416f5a91aded450f1c92b01826210ea.zip
Merge branch 'eschnett-eschnett/boost-mpi-osx' into develop
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/boost/package.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/boost/package.py b/var/spack/repos/builtin/packages/boost/package.py
index 82ce6fbb74..f889da21f2 100644
--- a/var/spack/repos/builtin/packages/boost/package.py
+++ b/var/spack/repos/builtin/packages/boost/package.py
@@ -2,6 +2,9 @@ from spack import *
import spack
import sys
+import os
+import sys
+
class Boost(Package):
"""Boost provides free peer-reviewed portable C++ source
libraries, emphasizing libraries that work well with the C++
@@ -173,6 +176,16 @@ class Boost(Package):
return threadingOpts
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()
for lib in Boost.all_libs:
if "+{0}".format(lib) in spec: