Fix libc-abis handling for add-ons.

diff --git a/ChangeLog b/ChangeLog
index 48bdfecec443c7ad8d55f606abaca078802dd116..71652e44d55ee48ddf60fc45487a420fb350f8b8 100644 (file)
--- 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 d5ff3837702e6309195f1869518abccdc4fa1f29..debac299c2072245a51cf6a042960987b19d00a2 100644 (file)
--- 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 \