Merge branch 'feature-github-actions' of github.com:FreeFem/FreeFem-s…

…ources into feature-github-actions
FreeFem · Dec 12, 2023 · b76b2dc · b76b2dc
2 parents eccd180 + 532c32c
commit b76b2dc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/job4-msmpi.yml b/.github/workflows/job4-msmpi.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Configure
         run: |
           autoreconf -i
-          ./configure --enable-generic --enable-optim --enable-download --enable-maintainer-mode --prefix="${HOME}/freefem"
+          ./configure --enable-generic --enable-optim --enable-download --enable-maintainer-mode --prefix="${HOME}/freefem" MPICC=mpicc MPICXX=mpicxx MPIFC=mpif90
           ./3rdparty/getall -a -o PETSc
 
       - name: PETSc

diff --git a/.github/workflows/job5-msmpi.yml b/.github/workflows/job5-msmpi.yml
@@ -52,7 +52,7 @@ jobs:
       - name: Configure
         run: |
           autoreconf -i
-          ./configure --enable-generic --enable-optim --enable-download --enable-maintainer-mode --enable-debug --prefix="${HOME}/freefem"
+          ./configure --enable-generic --enable-optim --enable-download --enable-maintainer-mode --enable-debug --prefix="${HOME}/freefem" MPICC=mpicc MPICXX=mpicxx MPIFC=mpif90
           ./3rdparty/getall -a -o PETSc
 
       - name: PETSc

diff --git a/3rdparty/ff-petsc/Makefile b/3rdparty/ff-petsc/Makefile
@@ -213,7 +213,7 @@ Makefile.inc:../../config.status Makefile Makefile-PETSc.inc
 
 $(SRCDIR)/tag-conf-real:$(SRCDIR)/tag-tar
 	cd $(SRCDIR) && $(PYTHON) ./configure --prefix=$(DIR_INSTALL_REAL) \
-		$(FLAGS_CONF_PETSC_REAL) PETSC_ARCH=fr
+		$(FLAGS_CONF_PETSC_REAL) PETSC_ARCH=fr || cat configure.log;
 	test -f $(SRCDIR)/fr/lib/petsc/conf/petscvariables
 	mkdir -p $(SRCDIR)/fc/externalpackages || true
 	cp -r $(SRCDIR)/fr/externalpackages/git.slepc $(SRCDIR)/fr/externalpackages/git.hpddm $(SRCDIR)/fc/externalpackages || true