fix backports

fds/6.5.3.spec

@@ -16,7 +16,7 @@
 %global intelmpi_build_command \
  dir=$(pwd) \
  target=${dir##*/} \
- make INTEL_IFORT=ifx MPIFORT=mpiifx VPATH="../../Source" -f ../makefile "$target"
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.6.0.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.0.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.1.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.3.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.4.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.5.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.6.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.7.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.8.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux_openmp
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.7.9.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux_openmp
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.8.0.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux_openmp
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.9.0.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux_openmp
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/6.9.1.spec

@@ -10,7 +10,10 @@
 %global intel_string impi_intel_linux_openmp
 %global build_dir Build
 %global openmpi_build_command ./make_fds.sh
-%global intelmpi_build_command ./make_fds.sh
+%global intelmpi_build_command \
+ dir=$(pwd) \
+ target=${dir##*/} \
+ make INTEL_IFORT=ifx FCOMPL=mpiifx VPATH="../../Source" -f ../makefile "$target"
 %global mpich_build_command \
  dir=$(pwd) \
  target=${dir##*/} \

fds/backports0.patch

@@ -1,44 +1,8 @@
-diff --git a/Build/impi_intel_linux/make_fds.sh b/Build/impi_intel_linux/make_fds.sh
-index 5e449d368..22de03a5d 100755
---- a/Build/impi_intel_linux/make_fds.sh
-+++ b/Build/impi_intel_linux/make_fds.sh
-@@ -7,4 +7,4 @@ dir=`pwd`
- target=${dir##*/}
-
- echo Building $target with Intel MPI and $INTEL_IFORT
--make -j4 VPATH="../../Source" -f ../makefile $target
-+make -j4 VPATH="../../Source" INTEL_IFORT=ifx INTEL_MPI_IFORT=mpiifx -f ../makefile $target
-diff --git a/Build/impi_intel_linux_openmp/make_fds.sh b/Build/impi_intel_linux_openmp/make_fds.sh
-index 5e449d368..22de03a5d 100755
---- a/Build/impi_intel_linux_openmp/make_fds.sh
-+++ b/Build/impi_intel_linux_openmp/make_fds.sh
-@@ -7,4 +7,4 @@ dir=`pwd`
- target=${dir##*/}
-
- echo Building $target with Intel MPI and $INTEL_IFORT
--make -j4 VPATH="../../Source" -f ../makefile $target
-+make -j4 VPATH="../../Source" INTEL_IFORT=ifx INTEL_MPI_IFORT=mpiifx -f ../makefile $target
 diff --git a/Build/makefile b/Build/makefile
-index 481a1f443..5c887b0f8 100644
+index 481a1f443..81068084a 100644
 --- a/Build/makefile
 +++ b/Build/makefile
-@@ -14,8 +14,14 @@ VPATH = ../Source
- # set compiler type
-
- I_IFORT=ifort
-+MPI_I_IFORT=mpifort
-+
- ifdef INTEL_IFORT
--   I_IFORT=$(INTEL_IFORT)
-+  I_IFORT=$(INTEL_IFORT)
-+endif
-+
-+ifdef INTEL_MPI_IFORT
-+  MPI_I_IFORT=$(INTEL_MPI_IFORT)
- endif
-
- ifeq ($(shell echo "check_quotes"),"check_quotes")
-@@ -73,8 +79,8 @@ else
+@@ -73,8 +73,8 @@ else
  ifneq ("$(wildcard ${MKLROOT}/lib/intel64/libmkl_blacs_intelmpi_lp64.a)","")
  # Use cluster_sparse_solver with intelmpi blacs
    FFLAGSMKL_INTEL = -DWITH_MKL -I"${MKLROOT}/include"
@@ -49,164 +13,20 @@ index 481a1f443..5c887b0f8 100644
  endif
  ifneq ("$(wildcard ${MKLROOT}/lib/intel64/libmkl_blacs_openmpi_lp64.a)","")
  # Use cluster_sparse_solver with openmpi blacs
-@@ -147,7 +153,7 @@ main.obj: FFLAGS += $(FOPENMPFLAGS)
-
- impi_intel_win : MPILIB = "$(IMPI_RELEASE_ROOT)\impi.lib"
- impi_intel_win : MPIINCLUDE = "$(I_MPI_ROOT)\include\mpi"
--impi_intel_win : FFLAGS = -D_WIN32 /Qipo /O2 /I$(MPIINCLUDE) /wrap-margin- $(GITINFO) $(FFLAGSMKL_INTEL) 
-+impi_intel_win : FFLAGS = -D_WIN32 /Qipo /O2 /I$(MPIINCLUDE) /wrap-margin- $(GITINFO) $(FFLAGSMKL_INTEL)
- impi_intel_win : FCOMPL = $(I_IFORT)
- impi_intel_win : obj = fds_impi_intel_win
- impi_intel_win : setup_win $(objwin_mpi)
-@@ -209,29 +215,29 @@ impi_intel_win_openmp_db : setup_win $(objwin_mpi)
-
- impi_intel_linux : FFLAGS = -m64 -fc=$(I_IFORT) -O2 -ipo -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
- impi_intel_linux : LFLAGSMKL = $(LFLAGSMKL_INTEL)
--impi_intel_linux : FCOMPL = mpiifort
-+impi_intel_linux : FCOMPL = $(MPI_I_IFORT)
- impi_intel_linux : obj = fds_impi_intel_linux
- impi_intel_linux : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-
- impi_intel_linux_openmp : FFLAGS = -m64 -fc=$(I_IFORT) -O2 -ipo -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
- impi_intel_linux_openmp : LFLAGSMKL = $(LFLAGSMKL_INTEL_OPENMP)
--impi_intel_linux_openmp : FCOMPL = mpiifort
-+impi_intel_linux_openmp : FCOMPL = $(MPI_I_IFORT)
- impi_intel_linux_openmp : FOPENMPFLAGS = -qopenmp
- impi_intel_linux_openmp : obj = fds_impi_intel_linux_openmp
+@@ -222,14 +222,14 @@ impi_intel_linux_openmp : obj = fds_impi_intel_linux_openmp
  impi_intel_linux_openmp : setup $(obj_mpi)
  	$(FCOMPL) $(FFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
 -impi_intel_linux_db : FFLAGS = -m64 -fc=$(I_IFORT) -check all -warn all -diag-error=remark,warn,error -O0 -g -traceback -fpe0 -nofltconsistency -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT -diag-disable=10448
 +impi_intel_linux_db : FFLAGS = -m64 -fc=$(I_IFORT) -check all -warn all -diag-error=remark,warn,error -O0 -g -traceback -fpe0 -nofltconsistency -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
  impi_intel_linux_db : LFLAGSMKL = $(LFLAGSMKL_INTEL)
--impi_intel_linux_db : FCOMPL = mpiifort
-+impi_intel_linux_db : FCOMPL = $(MPI_I_IFORT)
+ impi_intel_linux_db : FCOMPL = mpiifort
  impi_intel_linux_db : obj = fds_impi_intel_linux_db
  impi_intel_linux_db : setup $(obj_mpi)
  	$(FCOMPL) $(FFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
 
 -impi_intel_linux_openmp_db : FFLAGS = -m64 -fc=$(I_IFORT) -check all -warn all -diag-error=remark,warn,error -O0 -g -traceback -fpe0 -nofltconsistency -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT -diag-disable=10448
 +impi_intel_linux_openmp_db : FFLAGS = -m64 -fc=$(I_IFORT) -check all -warn all -diag-error=remark,warn,error -O0 -g -traceback -fpe0 -nofltconsistency -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
  impi_intel_linux_openmp_db : LFLAGSMKL = $(LFLAGSMKL_INTEL_OPENMP)
--impi_intel_linux_openmp_db : FCOMPL = mpiifort
-+impi_intel_linux_openmp_db : FCOMPL = $(MPI_I_IFORT)
+ impi_intel_linux_openmp_db : FCOMPL = mpiifort
  impi_intel_linux_openmp_db : FOPENMPFLAGS = -qopenmp
- impi_intel_linux_openmp_db : obj = fds_impi_intel_linux_openmp_db
- impi_intel_linux_openmp_db : setup $(obj_mpi)
-@@ -239,14 +245,14 @@ impi_intel_linux_openmp_db : setup $(obj_mpi)
-
- impi_intel_linux_dv : FFLAGS = -m64 -fc=$(I_IFORT) -warn unused -O1 -g -traceback -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
- impi_intel_linux_dv : LFLAGSMKL = $(LFLAGSMKL_INTEL)
--impi_intel_linux_dv : FCOMPL = mpiifort
-+impi_intel_linux_dv : FCOMPL = $(MPI_I_IFORT)
- impi_intel_linux_dv : obj = fds_impi_intel_linux_dv
- impi_intel_linux_dv : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-
- impi_intel_linux_openmp_dv : FFLAGS = -m64 -fc=$(I_IFORT) -warn unused -O1 -g -traceback -no-wrap-margin $(GITINFO) $(FFLAGSMKL_INTEL) -DUSE_IFPORT
- impi_intel_linux_openmp_dv : LFLAGSMKL = $(LFLAGSMKL_INTEL_OPENMP)
--impi_intel_linux_openmp_dv : FCOMPL = mpiifort
-+impi_intel_linux_openmp_dv : FCOMPL = $(MPI_I_IFORT)
- impi_intel_linux_openmp_dv : FOPENMPFLAGS = -qopenmp
- impi_intel_linux_openmp_dv : obj = fds_impi_intel_linux_openmp_dv
- impi_intel_linux_openmp_dv : setup $(obj_mpi)
-@@ -257,7 +263,7 @@ impi_intel_linux_openmp_dv : setup $(obj_mpi)
- ompi_intel_osx : FFLAGS = -m64 -O2 -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_CUSTOM)
- ompi_intel_osx : LFLAGSMKL = $(LFLAGSMKL_CUSTOM) $(CLT_VERSION)
- ompi_intel_osx : LFLAGS = -static-intel
--ompi_intel_osx : FCOMPL = mpifort
-+ompi_intel_osx : FCOMPL = $(MPI_I_IFORT)
- ompi_intel_osx : obj = fds_ompi_intel_osx
- ompi_intel_osx : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) $(LFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-@@ -266,7 +272,7 @@ ompi_intel_osx_openmp : FFLAGS = -m64 -O2 -stand:f18 -no-wrap-margin $(GITINFO)
- ompi_intel_osx_openmp : LFLAGSMKL = $(LFLAGSMKL_CUSTOM_OPENMP) $(CLT_VERSION)
- ompi_intel_osx_openmp : LFLAGS = -static-intel
- ompi_intel_osx_openmp : FOPENMPFLAGS = -qopenmp -qopenmp-link static
--ompi_intel_osx_openmp : FCOMPL = mpifort
-+ompi_intel_osx_openmp : FCOMPL = $(MPI_I_IFORT)
- ompi_intel_osx_openmp : obj = fds_ompi_intel_osx_openmp
- ompi_intel_osx_openmp : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) $(LFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-@@ -274,7 +280,7 @@ ompi_intel_osx_openmp : setup $(obj_mpi)
- ompi_intel_osx_db : FFLAGS = -m64 -check all -fp-stack-check -warn unused -O0 -auto -WB -g -traceback -fpe0 -nofltconsistency -stand:f18 -no-wrap-margin $(GITINFO) $(FFLAGSMKL_CUSTOM)
- ompi_intel_osx_db : LFLAGSMKL = $(LFLAGSMKL_CUSTOM) $(CLT_VERSION)
- ompi_intel_osx_db : LFLAGS = -static-intel
--ompi_intel_osx_db : FCOMPL = mpifort
-+ompi_intel_osx_db : FCOMPL = $(MPI_I_IFORT)
- ompi_intel_osx_db : obj = fds_ompi_intel_osx_db
- ompi_intel_osx_db : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) $(LFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-@@ -283,7 +289,7 @@ ompi_intel_osx_openmp_db : FFLAGS = -m64 -check all -fp-stack-check -warn unused
- ompi_intel_osx_openmp_db : LFLAGSMKL = $(LFLAGSMKL_CUSTOM_OPENMP) $(CLT_VERSION)
- ompi_intel_osx_openmp_db : LFLAGS = -static-intel
- ompi_intel_osx_openmp_db : FOPENMPFLAGS = -qopenmp -qopenmp-link static
--ompi_intel_osx_openmp_db : FCOMPL = mpifort
-+ompi_intel_osx_openmp_db : FCOMPL = $(MPI_I_IFORT)
- ompi_intel_osx_openmp_db : obj = fds_ompi_intel_osx_openmp_db
- ompi_intel_osx_openmp_db : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) $(LFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-@@ -291,7 +297,7 @@ ompi_intel_osx_openmp_db : setup $(obj_mpi)
- ompi_intel_osx_dv : FFLAGS = -m64 -warn unused -O1 -g -traceback -stand:f18 -no-wrap-margin  $(GITINFO) $(FFLAGSMKL_CUSTOM)
- ompi_intel_osx_dv : LFLAGSMKL = $(LFLAGSMKL_CUSTOM) $(CLT_VERSION)
- ompi_intel_osx_dv : LFLAGS = -static-intel
--ompi_intel_osx_dv : FCOMPL = mpifort
-+ompi_intel_osx_dv : FCOMPL = $(MPI_I_IFORT)
- ompi_intel_osx_dv : obj = fds_ompi_intel_osx_dv
- ompi_intel_osx_dv : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) $(LFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-@@ -300,7 +306,7 @@ ompi_intel_osx_openmp_dv : FFLAGS = -m64 -warn unused -O1 -g -traceback -stand:f
- ompi_intel_osx_openmp_dv : LFLAGSMKL = $(LFLAGSMKL_CUSTOM_OPENMP) $(CLT_VERSION)
- ompi_intel_osx_openmp_dv : LFLAGS = -static-intel
- ompi_intel_osx_openmp_dv : FOPENMPFLAGS = -qopenmp -qopenmp-link static
--ompi_intel_osx_openmp_dv : FCOMPL = mpifort
-+ompi_intel_osx_openmp_dv : FCOMPL = $(MPI_I_IFORT)
- ompi_intel_osx_openmp_dv : obj = fds_ompi_intel_osx_openmp_dv
- ompi_intel_osx_openmp_dv : setup $(obj_mpi)
- 	$(FCOMPL) $(FFLAGS) $(LFLAGS) $(FOPENMPFLAGS) -o $(obj) $(obj_mpi) $(LFLAGSMKL)
-@@ -309,7 +315,7 @@ ompi_intel_osx_openmp_dv : setup $(obj_mpi)
-
- ompi_gnu_linux : FFLAGS = -m64 -O2 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS)
- ompi_gnu_linux : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI)
--ompi_gnu_linux : FCOMPL = mpifort
-+ompi_gnu_linux : FCOMPL = $(MPI_I_IFORT)
- ompi_gnu_linux : FOPENMPFLAGS = -fopenmp
- ompi_gnu_linux : obj = fds_ompi_gnu_linux
- ompi_gnu_linux : setup $(obj_mpi)
-@@ -317,7 +323,7 @@ ompi_gnu_linux : setup $(obj_mpi)
-
- ompi_gnu_linux_db : FFLAGS = -m64 -O0 -std=f2018 -ggdb -Wall -Werror -Wunused-parameter -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics -fbounds-check $(GITINFOGNU) $(FFLAGSMKL_GNU_OPENMPI) $(GFORTRAN_OPTIONS)
- ompi_gnu_linux_db : LFLAGSMKL = $(LFLAGSMKL_GNU_OPENMPI)
--ompi_gnu_linux_db : FCOMPL = mpifort
-+ompi_gnu_linux_db : FCOMPL = $(MPI_I_IFORT)
- ompi_gnu_linux_db : FOPENMPFLAGS = -fopenmp
- ompi_gnu_linux_db : obj = fds_ompi_gnu_linux_db
- ompi_gnu_linux_db : setup $(obj_mpi)
-@@ -325,7 +331,7 @@ ompi_gnu_linux_db : setup $(obj_mpi)
-
- ompi_gnu_osx : FFLAGS = -m64 -O2 -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
- ompi_gnu_osx : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM) $(CLT_VERSION)
--ompi_gnu_osx : FCOMPL = mpifort
-+ompi_gnu_osx : FCOMPL = $(MPI_I_IFORT)
- ompi_gnu_osx : FOPENMPFLAGS = -fopenmp
- ompi_gnu_osx : obj = fds_ompi_gnu_osx
- ompi_gnu_osx : setup $(obj_mpi)
-@@ -333,7 +339,7 @@ ompi_gnu_osx : setup $(obj_mpi)
-
- ompi_gnu_osx_db : FFLAGS = -m64 -O0 -std=f2018 -ggdb -Wall -Wcharacter-truncation -Wno-target-lifetime -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
- ompi_gnu_osx_db : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM) $(CLT_VERSION)
--ompi_gnu_osx_db : FCOMPL = mpifort
-+ompi_gnu_osx_db : FCOMPL = $(MPI_I_IFORT)
- ompi_gnu_osx_db : FOPENMPFLAGS = -fopenmp
- ompi_gnu_osx_db : obj = fds_ompi_gnu_osx_db
- ompi_gnu_osx_db : setup $(obj_mpi)
-@@ -341,7 +347,7 @@ ompi_gnu_osx_db : setup $(obj_mpi)
-
- ompi_gnu_osx_dv : FFLAGS = -m64 -O1 -fbacktrace -std=f2018 -frecursive -ffpe-summary=none -fall-intrinsics $(GITINFOGNU) $(FFLAGSMKL_GNU_CUSTOM) $(GFORTRAN_OPTIONS)
- ompi_gnu_osx_dv : LFLAGSMKL = $(LFLAGSMKL_GNU_CUSTOM) $(CLT_VERSION)
--ompi_gnu_osx_dv : FCOMPL = mpifort
-+ompi_gnu_osx_dv : FCOMPL = $(MPI_I_IFORT)
- ompi_gnu_osx_dv : FOPENMPFLAGS = -fopenmp
- ompi_gnu_osx_dv : obj = fds_ompi_gnu_osx_dv
- ompi_gnu_osx_dv : setup $(obj_mpi)