From 3857d3d6f996b53e063dc15a0fc604a1b8582681 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 4 Apr 2019 15:13:34 +0200 Subject: openmpi: use absolute paths compiler wrapper The MPI compiler wrappers should point to the compilers used at build time per default. --- pkgs/development/libraries/openmpi/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'pkgs/development/libraries/openmpi') diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 974e98ad209..4ab2dd41855 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl -, rdma-core, zlib, numactl, libevent, hwloc +, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget # Enable the Sun Grid Engine bindings , enableSGE ? false @@ -58,6 +58,23 @@ in stdenv.mkDerivation rec { rm -f $out/lib/*.la ''; + postFixup = '' + # default compilers should be indentical to the + # compilers at build time + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + $out/share/openmpi/mpicc-wrapper-data.txt + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ + $out/share/openmpi/ortecc-wrapper-data.txt + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \ + $out/share/openmpi/mpic++-wrapper-data.txt + + sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:' \ + $out/share/openmpi/mpifort-wrapper-data.txt + ''; + doCheck = true; meta = with stdenv.lib; { -- cgit 1.4.1