Skip to content

Commit 2b4d8d5

Browse files
committed
Fix MPICH build reproducibility
1 parent 1131f4a commit 2b4d8d5

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

cibw-build-mpi.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -258,13 +258,15 @@ if test ! -e "$WORKDIR"/config.log; then
258258
sed -i.orig "$workdir" "$filename"
259259
sed -i.orig "$destdir" "$filename"
260260
fi
261-
test -n "${FCFLAGS+x}" || continue
262-
test "$(basename "$filename")" != "Makefile" || continue
263-
fortran="s|\"(gfortran)\s*$FCFLAGS\s*(-O2)?\s*\"|\"\1 -O2\"|g"
264-
fcflags="s|'(FC?FLAGS)=\s*$FCFLAGS\s*(-O2)?\s*'|'\1=-O2'|g"
265-
echo removing Fortran compiler flags in "$filename"
266-
sed -i.orig -E "$fortran" "$filename"
267-
sed -i.orig -E "$fcflags" "$filename"
261+
if test "$mpiname" = "mpich"; then
262+
confargs='s|".*"|""|g'
263+
compiler='s|"([^[:space:]]*).*"|"\1"|g'
264+
echo removing configure and compiler info in "$filename"
265+
sed -i.orig -E "/HYDRA_CC/ $compiler" "$filename"
266+
sed -i.orig -E "/MPICH_COMPILER_(C|F)/ $compiler" "$filename"
267+
sed -i.orig -E "/HYDRA_CONFIGURE_ARGS/ $confargs" "$filename"
268+
sed -i.orig -E "/MPICH_CONFIGURE_ARGS/ $confargs" "$filename"
269+
fi
268270
done
269271
fi
270272

0 commit comments

Comments
 (0)