Unverified Commit deb00097 authored by markuskowa's avatar markuskowa Committed by GitHub
Browse files

Merge pull request #264563 from markuskowa/fix-mvapich 

mvapich: fix RPATH issues and infiniband build
parents ff10d312 b8f2bc07

pkgs/development/libraries/mvapich/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec { 
    "FFLAGS=-fallow-argument-mismatch" # fix build with gfortran 10

  ] ++ optional useSlurm "--with-pm=slurm"

    ++ optional (network == "ethernet") "--with-device=ch3:sock"

    ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" ]

    ++ optionals (network == "infiniband") [ "--with-device=ch3:mrail" "--with-rdma=gen2" "--disable-ibv-dlopen" ]

    ++ optionals (network == "omnipath") ["--with-device=ch3:psm" "--with-psm2=${libpsm2}"];



  doCheck = true;
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec { 
    # /tmp/nix-build... ends up in the RPATH, fix it manually

    for entry in $out/bin/mpichversion $out/bin/mpivars; do

      echo "fix rpath: $entry"

      patchelf --set-rpath "$out/lib" $entry

      patchelf --allowed-rpath-prefixes ${builtins.storeDir} --shrink-rpath $entry

    done



    # Ensure the default compilers are the ones mvapich was built with