From: Alastair McKinstry Date: Wed, 29 Sep 2021 10:49:06 +0000 (+0100) Subject: mpifort X-Git-Tag: archive/raspbian/4.1.2_rc1-4+rpi1^2~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5881f315e52249faf332ac09a064be62d12517aa;p=openmpi.git mpifort =================================================================== Gbp-Pq: Name mpifort.patch --- diff --git a/ompi/tools/wrappers/mpifort-wrapper-data.txt.in b/ompi/tools/wrappers/mpifort-wrapper-data.txt.in index 27a7c05e..c57bf078 100644 --- a/ompi/tools/wrappers/mpifort-wrapper-data.txt.in +++ b/ompi/tools/wrappers/mpifort-wrapper-data.txt.in @@ -12,6 +12,7 @@ language=Fortran compiler_env=FC compiler_flags_env=FCFLAGS compiler=@FC@ +compiler_version=@COMPILER_VERSION@ preprocessor_flags= compiler_flags=@OMPI_WRAPPER_EXTRA_FCFLAGS@ linker_flags=@OMPI_WRAPPER_EXTRA_FC_LDFLAGS@ @@ -24,5 +25,5 @@ libs_static=@OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ -l@OMPI_LIBMP dyn_lib_file=lib@OMPI_LIBMPI_NAME@.@OPAL_DYN_LIB_SUFFIX@ static_lib_file=lib@OMPI_LIBMPI_NAME@.a required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@ -includedir=${includedir} -libdir=${libdir} +includedir=${libdir}/../../fortran/@COMPILER_VERSION@/openmpi +libdir=${libdir}/fortran/@FC@