From 38abdf098de82087b90eb380b5dc97cd36b0b52c Mon Sep 17 00:00:00 2001
From: Nathalie Furmento <nathalie.furmento@labri.fr>
Date: Wed, 29 May 2024 12:07:48 +0200
Subject: [PATCH] make: fix variable setting

---
 examples/stencil/Makefile.am |  4 +---
 make/starpu-tests.mk         | 12 +++++++++---
 mpi/examples/Makefile.am     |  5 +----
 mpi/tests/Makefile.am        |  3 ---
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/examples/stencil/Makefile.am b/examples/stencil/Makefile.am
index d27e6405ef..582787e10d 100644
--- a/examples/stencil/Makefile.am
+++ b/examples/stencil/Makefile.am
@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2010-2023  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2010-2024  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -30,8 +30,6 @@ LIBS += $(STARPU_EXPORTED_LIBS)
 if STARPU_USE_MPI
 LIBS += $(top_builddir)/mpi/src/libstarpumpi-@STARPU_EFFECTIVE_VERSION@.la
 AM_CPPFLAGS += -I$(top_srcdir)/mpi/include
-LAUNCHER			= $(STARPU_MPIEXEC)
-LAUNCHER_ENV			= $(MPI_RUN_ENV)
 if STARPU_SIMGRID
 NVCCFLAGS		+= --compiler-options -fPIC
 endif
diff --git a/make/starpu-tests.mk b/make/starpu-tests.mk
index 294129df7a..26dc0d4cf0 100644
--- a/make/starpu-tests.mk
+++ b/make/starpu-tests.mk
@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2016-2023  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2016-2024  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 #
 # StarPU is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -14,8 +14,6 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 
-LAUNCHER_ENV	=
-LAUNCHER	=
 include $(top_srcdir)/make/starpu.mk
 
 STARPU_MPI_NP ?= 4
@@ -28,6 +26,14 @@ else
 STARPU_MPIEXEC			= $(MPIEXEC) $(MPIEXEC_ARGS) -np $(STARPU_MPI_NP)
 endif
 
+if STARPU_USE_MPI
+LAUNCHER	= $(STARPU_MPIEXEC)
+LAUNCHER_ENV	= $(MPI_RUN_ENV)
+else
+LAUNCHER_ENV	=
+LAUNCHER	=
+endif
+
 showcheckfailed:
 	@ for x in $(shell grep -l "^FAIL " $(TEST_LOGS) /dev/null 2>/dev/null) ; do cat $$x ; done
 	@RET=0 ; \
diff --git a/mpi/examples/Makefile.am b/mpi/examples/Makefile.am
index ef8203e620..2154d0370d 100644
--- a/mpi/examples/Makefile.am
+++ b/mpi/examples/Makefile.am
@@ -1,6 +1,6 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
-# Copyright (C) 2009-2023  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-2024  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
 # Copyright (C) 2013       Thibaut Lambert
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -23,9 +23,6 @@ FCLD=$(MPIFORT)
 
 include $(top_srcdir)/make/starpu-loader.mk
 
-LAUNCHER	= $(STARPU_MPIEXEC)
-LAUNCHER_ENV	= $(MPI_RUN_ENV)
-
 if STARPU_SIMGRID
 LOADER_BIN = $(LAUNCHER)
 endif
diff --git a/mpi/tests/Makefile.am b/mpi/tests/Makefile.am
index 24c1137a94..8557165863 100644
--- a/mpi/tests/Makefile.am
+++ b/mpi/tests/Makefile.am
@@ -23,9 +23,6 @@ CCLD=$(MPICC)
 
 include $(top_srcdir)/make/starpu-loader.mk
 
-LAUNCHER	= $(STARPU_MPIEXEC)
-LAUNCHER_ENV	= $(MPI_RUN_ENV)
-
 if STARPU_SIMGRID
 LOADER_BIN = $(LAUNCHER)
 endif