diff options
| author | Roland McGrath <roland@redhat.com> | 2010-04-08 15:29:19 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2010-04-08 15:29:19 -0700 |
| commit | df5efd61b01c52573bfd011b93a96966047308c6 (patch) | |
| tree | 9970710c7efe96964143473582073b9f2ed0478e | |
| parent | 5e4295fb58a41f27e5158746deb8e40421d2e67b (diff) | |
| download | glibc-df5efd61b01c52573bfd011b93a96966047308c6.tar.gz glibc-df5efd61b01c52573bfd011b93a96966047308c6.tar.xz glibc-df5efd61b01c52573bfd011b93a96966047308c6.zip | |
Fix libc-abis rules to be correct for add-on ports.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makerules | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index c2ce3a994a..71a392e8c5 100644 --- 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 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 |