Compare commits

..

2 Commits

Author SHA1 Message Date
100e4e7029
Fix osu cross-compilation
Some checks failed
CI / build:cross (pull_request) Failing after 19s
CI / build:all (pull_request) Failing after 23s
2025-10-31 11:53:54 +01:00
8d56802b1c
Set mpich default compilers from targetPackages 2025-10-31 11:44:32 +01:00
2 changed files with 2 additions and 2 deletions

View File

@ -47,7 +47,7 @@ in mpich.overrideAttrs (old: {
preFixup = '' preFixup = ''
sed -i 's:^CC=.*:CC=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' $out/bin/mpicc sed -i 's:^CC=.*:CC=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' $out/bin/mpicc
sed -i 's:^CXX=.*:CXX=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' $out/bin/mpicxx sed -i 's:^CXX=.*:CXX=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}++:' $out/bin/mpicxx
'' + lib.optionalString enableFortran '' '' + lib.optionalString enableFortran ''
sed -i 's:^FC=.*:FC=${targetPackages.gfortran or gfortran}/bin/${targetPackages.gfortran.targetPrefix or gfortran.targetPrefix}gfortran:' $out/bin/mpifort sed -i 's:^FC=.*:FC=${targetPackages.gfortran or gfortran}/bin/${targetPackages.gfortran.targetPrefix or gfortran.targetPrefix}gfortran:' $out/bin/mpifort
''; '';

View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
env = { env = {
MPICH_CC="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; MPICH_CC="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
MPICH_CXX="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; MPICH_CXX="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}++";
}; };
postInstall = '' postInstall = ''