Fix libc-abis rules to be correct for add-on ports.

diff --git a/ChangeLog b/ChangeLog
index c2ce3a994a3bc83c0d64000a0c8ead43806e4b19..71a392e8c5fb0b1b07dd86c3905b147acbb4f3e3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-08  Roland McGrath  <roland@redhat.com>
+
+       * Makerules (libc-abis): Variable removed.
+       ($(common-objpfx)libc-abis.h): Depend on Makerules too.
+       Use automatic variables in commands.
+       Depend on first libc-abis from $(sysdirs) or $(..).
+
 2010-04-07  Ulrich Drepper  <drepper@redhat.com>
 
        * posix/bug-getopt1.c: New file.

diff --git a/Makerules b/Makerules
index 9c15a27a5df041644789387e3e29dccd40fc19bf..bf03b38a9c752d7ad85f0b20c36e46ac0531992c 100644 (file)
--- 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