From 9162c01d09c327ae2e7c3a5148307e8018792c51 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Thu, 5 Mar 2015 12:58:49 -0800
Subject: Avoid re-exec-self in bug-setlocale1.

---
 Rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Rules')

diff --git a/Rules b/Rules
index cb4e1fb767..829beac487 100644
--- a/Rules
+++ b/Rules
@@ -186,9 +186,11 @@ ifneq "$(strip $(tests) $(xtests) $(test-srcs))" ""
 # These are the implicit rules for making test outputs
 # from the test programs and whatever input files are present.
 
-make-test-out = $(test-wrapper-env) \
-		$(run-program-env) \
-		$($*-ENV) $(host-test-program-cmd) $($*-ARGS)
+define make-test-out
+$(if $($*-ENV-only),$(test-wrapper-env-only) $($*-ENV-only),\
+     $(test-wrapper-env) $(run-program-env) $($*-ENV)) \
+$(host-test-program-cmd) $($*-ARGS)
+endef
 $(objpfx)%.out: %.input $(objpfx)%
 	$(make-test-out) > $@ < $(word 1,$^); \
 	$(evaluate-test)
-- 
cgit v1.2.3-70-g09d2