From e80c0d50278884196a6c43be608346f03a4766ba Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Mon, 21 Mar 2011 15:29:59 -0700
Subject: [PATCH] Fix CFG_RUN* rules a bit harder. Can now do 'make check' on
 both boot and stage0 targets.

---
 Makefile.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0c1345308e7..5c68e79af25 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -89,9 +89,10 @@ ifdef CFG_UNIXY
   CFG_EXE_SUFFIX :=
   CFG_LDPATH :=$(CFG_LDPATH):$(CFG_LLVM_LIBDIR)
   CFG_RUN_TARG=\
-      LD_LIBRARY_PATH=$(dir $(1)):$(CFG_LDPATH) $(1)
+      LD_LIBRARY_PATH=$(dir $(firstword $(1))):$(CFG_LDPATH) $(1)
   CFG_RUN_TEST=\
-      LD_LIBRARY_PATH=$(dir $(1)):$(CFG_LDPATH) $(CFG_VALGRIND) $(1)
+      LD_LIBRARY_PATH=$(dir $(firstword $(1))):$(CFG_LDPATH) \
+      $(CFG_VALGRIND) $(1)
 
   CFG_BOOT_NATIVE := 1