From df5efd61b01c52573bfd011b93a96966047308c6 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Thu, 8 Apr 2010 15:29:19 -0700
Subject: Fix libc-abis rules to be correct for add-on ports.

---
 Makerules | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Makerules')

diff --git a/Makerules b/Makerules
index 9c15a27a5d..bf03b38a9c 100644
--- a/Makerules
+++ b/Makerules
@@ -111,13 +111,13 @@ endif # $(versioning) = yes
 
 ifndef avoid-generated
 before-compile := $(common-objpfx)libc-abis.h $(before-compile)
-libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), \
-				    $(..)$D/libc-abis)) \
-			 $(..)libc-abis)
-$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis $(libc-abis)
-	$(SHELL) $(..)scripts/gen-libc-abis \
+$(common-objpfx)libc-abis.h: $(..)scripts/gen-libc-abis \
+			     $(firstword $(wildcard $(sysdirs:=/libc-abis)) \
+					 $(..)libc-abis) \
+			     $(..)Makerules
+	$(SHELL) $< \
 		 $(base-machine)-$(config-vendor)-$(config-os) \
-		 < $(libc-abis) > $@T
+		 < $(word 2,$^) > $@T
 	$(move-if-change) $@T $@
 common-generated += $(common-objpfx)libc-abis.h
 endif # avoid-generated
-- 
cgit 1.4.1