From 654733b0044508f430b06672dbef652dcf5efaae Mon Sep 17 00:00:00 2001 From: sfilippone Date: Thu, 13 Feb 2025 17:15:57 +0100 Subject: [PATCH] Use FLIBS in configry for specific Fortran libs --- Make.inc.in | 1 + configure | 4 +++- configure.ac | 3 ++- test/cudakern/Makefile | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Make.inc.in b/Make.inc.in index 0e2b1641..9a1999f5 100755 --- a/Make.inc.in +++ b/Make.inc.in @@ -28,6 +28,7 @@ MPCC=@MPICC@ FLINK=@FLINK@ LIBS=@LIBS@ +FLIBS=@FLIBS@ # BLAS, BLACS and METIS libraries. BLAS=@BLAS_LIBS@ diff --git a/configure b/configure index 3fb3bdf2..8b972b1a 100755 --- a/configure +++ b/configure @@ -702,6 +702,7 @@ INSTALL_DIR INSTALL MPIFCC AR +FLIBS FLINK MODEXT FMFLAG @@ -11424,10 +11425,11 @@ UTILLIBNAME=libpsb_util.a + PSBLASRULES=' -PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIB) $(LIBS) +PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIB) $(FLIBS) $(LIBS) CXXDEFINES=$(PSBCXXDEFINES) CDEFINES=$(PSBCDEFINES) FDEFINES=$(PSBFDEFINES) diff --git a/configure.ac b/configure.ac index 28d7ab7e..54b2a012 100755 --- a/configure.ac +++ b/configure.ac @@ -955,6 +955,7 @@ AC_SUBST(FMFLAG) AC_SUBST(MODEXT) AC_SUBST(FLINK) AC_SUBST(LIBS) +AC_SUBST(FLIBS) AC_SUBST(AR) AC_SUBST(RANLIB) AC_SUBST(MPIFC) @@ -978,7 +979,7 @@ AC_SUBST(CINCLUDES) AC_SUBST(FINCLUDES) PSBLASRULES=' -PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIB) $(LIBS) +PSBLDLIBS=$(LAPACK) $(BLAS) $(METIS_LIB) $(AMD_LIB) $(FLIBS) $(LIBS) CXXDEFINES=$(PSBCXXDEFINES) CDEFINES=$(PSBCDEFINES) FDEFINES=$(PSBFDEFINES) diff --git a/test/cudakern/Makefile b/test/cudakern/Makefile index 4b8091d5..e1c3b78d 100755 --- a/test/cudakern/Makefile +++ b/test/cudakern/Makefile @@ -27,7 +27,7 @@ dir: (if test ! -d $(EXEDIR); then mkdir $(EXEDIR); fi) dpdegenmv.o spdegenmv.o: data_input.o dpdegenmv: $(DPGOBJS) - $(FLINK) $(LOPT) $(DPGOBJS) -fopenmp -o dpdegenmv $(FINCLUDES) $(PSBLAS_LIB) $(LDLIBS) + $(FLINK) $(LOPT) $(DPGOBJS) -o dpdegenmv $(FINCLUDES) $(PSBLAS_LIB) $(LDLIBS) /bin/mv dpdegenmv $(EXEDIR) spdegenmv: $(SPGOBJS) $(FLINK) $(LOPT) $(SPGOBJS) -o spdegenmv $(PSBLAS_LIB) $(LDLIBS)