alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #88984 from matthewbauer/gfortran-no-pkgsTargetTarget

Browse source 
openmpi: use pkgsHostTarget for gfortran
This commit is contained in:
Matthew Bauer 2020-05-27 10:11:42 -05:00 committed by GitHub
parent e8896deced c60144d4c0
commit 673827fd31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/libraries/openmpi/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
, rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
, libpsm2, libfabric , libpsm2, libfabric
# Enable CUDA support # Enable CUDA support
@ -75,16 +75,16 @@ in stdenv.mkDerivation rec {
# default compilers should be indentical to the # default compilers should be indentical to the
# compilers at build time # compilers at build time
sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \
$out/share/openmpi/mpicc-wrapper-data.txt $out/share/openmpi/mpicc-wrapper-data.txt
sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc:' \ sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \
$out/share/openmpi/ortecc-wrapper-data.txt $out/share/openmpi/ortecc-wrapper-data.txt
sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++:' \ sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \
$out/share/openmpi/mpic++-wrapper-data.txt $out/share/openmpi/mpic++-wrapper-data.txt
sed -i 's:compiler=.*:compiler=${pkgsTargetTarget.gfortran}/bin/${pkgsTargetTarget.gfortran.targetPrefix}gfortran:' \ sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \
$out/share/openmpi/mpifort-wrapper-data.txt $out/share/openmpi/mpifort-wrapper-data.txt
''; '';