diff options
| author | eschnett <eschnett@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2015-04-27 15:14:04 +0000 |
|---|---|---|
| committer | eschnett <eschnett@043a8217-7a68-40fe-abfd-36aa7d4fa6a8> | 2015-04-27 15:14:04 +0000 |
| commit | 37c816110763b321a177a895cadbc6558fe4219e (patch) | |
| tree | cae74097b667517df6c4ed394c600ae7b87f00e0 | |
| parent | 6ddfe94fdb0f1286fd73661d8e09ccae8e6d82a0 (diff) | |
OpenMPI depends on hwloc
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/MPI/trunk@62 043a8217-7a68-40fe-abfd-36aa7d4fa6a8
| -rw-r--r-- | configuration.ccl | 4 | ||||
| -rw-r--r-- | src/build.pl | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/configuration.ccl b/configuration.ccl index d094783..eb9715a 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -9,3 +9,7 @@ PROVIDES MPI # Pass configuration options to build script REQUIRES MPI + +OPTIONAL hwloc +{ +} diff --git a/src/build.pl b/src/build.pl index d3c383b..03622fe 100644 --- a/src/build.pl +++ b/src/build.pl @@ -64,7 +64,11 @@ chdir(${NAME}); # Cannot have a memory manager with a static library on some systems # (e.g. Linux); see # <http://www.open-mpi.org/faq/?category=mpi-apps#static-mpi-apps> -system("./configure --prefix=$mpi_dir --without-memory-manager --without-libnuma --enable-shared=no --enable-static=yes") == 0 or die; +my $hwloc_opts = ''; +if ($ENV{HWLOC_DIR} ne '') { + $hwloc_opts = "--with-hwloc=$ENV{HWLOC_DIR}"; +} +system("./configure --prefix=$mpi_dir $hwloc_opts --without-memory-manager --without-libnuma --enable-shared=no --enable-static=yes") == 0 or die; print "MPI: Building...\n"; system("$ENV{MAKE}") == 0 or die; |