From: Joseph Myers <joseph@codesourcery.com>
Date: Wed, 7 Apr 2010 00:32:29 +0000 (-0700)
Subject: Fix libc-abis handling for add-ons.
X-Git-Tag: fedora/glibc-2.11.90-18~1^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8824d4aa66d0bf343eac5176ebd0f5601462b677;p=thirdparty%2Fglibc.git

Fix libc-abis handling for add-ons.
---

diff --git a/ChangeLog b/ChangeLog
index 48bdfecec44..71652e44d55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
+
 2010-04-05  Thomas Schwinge  <thomas@schwinge.name>
 
 	* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.
diff --git a/Makerules b/Makerules
index d5ff3837702..debac299c20 100644
--- a/Makerules
+++ b/Makerules
@@ -111,7 +111,8 @@ endif # $(versioning) = yes
 
 ifndef avoid-generated
 before-compile := $(common-objpfx)libc-abis.h $(before-compile)
-libc-abis := $(firstword $(wildcard $(foreach D,$(add-ons), $(..)libc-abis)) \
+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 \