diff --git a/src/libext/mpich/build_mpich.sh b/src/libext/mpich/build_mpich.sh index 7272798100..125b702c3f 100755 --- a/src/libext/mpich/build_mpich.sh +++ b/src/libext/mpich/build_mpich.sh @@ -52,7 +52,13 @@ if [ -x "$(command -v xx-info)" ]; then fi fi echo SHARED_FLAGS is $SHARED_FLAGS -./configure --prefix=`pwd`/../.. --enable-fortran=all $SHARED_FLAGS --disable-cxx --enable-romio --disable-cuda --disable-opencl --enable-silent-rules --enable-fortran=all +if [ $(uname -s) == "Darwin" ]; then + if pkg-config hwloc --exists; then + HWLOC_FLAGS=" --with-hwloc=$(pkg-config hwloc --variable=prefix) " + fi +fi +echo HWLOC_FLAGS is $HWLOC_FLAGS +./configure --prefix=`pwd`/../.. --enable-fortran=all $SHARED_FLAGS --disable-cxx --enable-romio --enable-silent-rules --enable-fortran=all $HWLOC_FLAGS #./configure --prefix=`pwd`/../.. --enable-fortran=all $SHARED_FLAGS --disable-cxx --enable-romio --with-pm=gforker --with-device=ch3:nemesis --disable-cuda --disable-opencl --enable-silent-rules --enable-fortran=all if [[ "$?" != "0" ]]; then cat config.log diff --git a/travis/build_env.sh b/travis/build_env.sh index 52262a9db4..d9af746ff9 100755 --- a/travis/build_env.sh +++ b/travis/build_env.sh @@ -49,7 +49,7 @@ fi else MPI_FORMULA="$MPI_IMPL" fi - HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew reinstall gcc $MPI_FORMULA gsed grep automake autoconf ||true + HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew reinstall gcc $MPI_FORMULA gsed grep automake autoconf hwloc ||true if [[ "$FC" != "gfortran" ]] && [[ "$FC" == "gfortran*" ]]; then #install non default gfortran, ie gfortran-9 #get version