From 04524ce44f30b875be822d379f3ba92a5b7020cf Mon Sep 17 00:00:00 2001
From: Nathalie Furmento <nathalie.furmento@labri.fr>
Date: Wed, 29 May 2024 13:14:52 +0200
Subject: [PATCH] Revert "make: fix variable setting"

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

diff --git a/examples/stencil/Makefile.am b/examples/stencil/Makefile.am
index 582787e10d..d27e6405ef 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-2024  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2010-2023  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,6 +30,8 @@ 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 26dc0d4cf0..294129df7a 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-2024  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2016-2023  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,6 +14,8 @@
 # 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
@@ -26,14 +28,6 @@ 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 2154d0370d..ef8203e620 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-2024  Université de Bordeaux, CNRS (LaBRI UMR 5800), Inria
+# Copyright (C) 2009-2023  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,6 +23,9 @@ 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 8557165863..24c1137a94 100644
--- a/mpi/tests/Makefile.am
+++ b/mpi/tests/Makefile.am
@@ -23,6 +23,9 @@ CCLD=$(MPICC)
 
 include $(top_srcdir)/make/starpu-loader.mk
 
+LAUNCHER	= $(STARPU_MPIEXEC)
+LAUNCHER_ENV	= $(MPI_RUN_ENV)
+
 if STARPU_SIMGRID
 LOADER_BIN = $(LAUNCHER)
 endif