gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openmpi: replace sed cross compilation fixes with substituteInPlace

Browse Source 
Using substituteInPlace (with `--replace-fail`) is much safer.
This commit is contained in:
Doron Behar
2024-08-06 19:54:59 +03:00
parent eaf636742e
commit 5809830ee6
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/openmpi/default.nix
+16 -8
View File
@@ -145,22 +145,30 @@ stdenv.mkDerivation (finalAttrs: {
# compilers at build time
echo "''${!outputDev}/share/openmpi/mpicc-wrapper-data.txt"
sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \
''${!outputDev}/share/openmpi/mpicc-wrapper-data.txt
substituteInPlace ''${!outputDev}/share/openmpi/mpicc-wrapper-data.txt \
--replace-fail \
compiler=gcc \
compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
echo "''${!outputDev}/share/openmpi/ortecc-wrapper-data.txt"
sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \
''${!outputDev}/share/openmpi/ortecc-wrapper-data.txt
substituteInPlace ''${!outputDev}/share/openmpi/ortecc-wrapper-data.txt \
--replace-fail \
compiler=gcc \
compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc
echo "''${!outputDev}/share/openmpi/mpic++-wrapper-data.txt"
sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \
''${!outputDev}/share/openmpi/mpic++-wrapper-data.txt
substituteInPlace ''${!outputDev}/share/openmpi/mpic++-wrapper-data.txt \
--replace-fail \
compiler=g++ \
compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++
''
+ lib.optionalString fortranSupport ''
echo "''${!outputDev}/share/openmpi/mpifort-wrapper-data.txt"
sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \
''${!outputDev}/share/openmpi/mpifort-wrapper-data.txt
substituteInPlace ''${!outputDev}/share/openmpi/mpifort-wrapper-data.txt \
--replace-fail \
compiler=gfortran \
compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran
'';