diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-02-12 13:28:06 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-02-13 10:45:20 -0800 |
| commit | 417e2162a6a4adb8b3e74aa5502c9c58a5569dc1 (patch) | |
| tree | 55b73288665d87398ac965fc9d1fcbc094ded9f6 | |
| parent | 95c26233a1c7dd73a852a4f3bffd2d2eeba5e2fd (diff) | |
| download | glibc-417e2162a6a4adb8b3e74aa5502c9c58a5569dc1.tar.gz glibc-417e2162a6a4adb8b3e74aa5502c9c58a5569dc1.tar.xz glibc-417e2162a6a4adb8b3e74aa5502c9c58a5569dc1.zip | |
Handle abi-tags files in add-on directories too. roland/add-on-abi-tags
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | csu/Makefile | 11 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 50adb3cbb3..32b3f1a05b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-12 Roland McGrath <roland@hack.frob.com> + + * csu/Makefile ($(objpfx)abi-tag.h): Handle abi-tags files in add-on + directories too. + 2015-02-13 Joseph Myers <joseph@codesourcery.com> [BZ #17967] diff --git a/csu/Makefile b/csu/Makefile index f7cf4af3d1..ea348aa791 100644 --- a/csu/Makefile +++ b/csu/Makefile @@ -107,10 +107,15 @@ $(addprefix $(objpfx),$(filter-out $(start-installed-name), $(csu-dummies))):\ $(COMPILE.c) -o $@ -x c /dev/null # These headers are used by the startup code. -$(objpfx)abi-tag.h: $(..)abi-tags +$(objpfx)abi-tag.h: $(..)abi-tags \ + $(foreach add-on,$(add-ons),\ + $(firstword $(wildcard \ + $(addprefix $(firstword $(filter /%,$(add-on)) \ + $(..)$(add-on))/,\ + abi-tags)))) $(make-target-directory) rm -f $@.new - sed -e 's/#.*$$//' -e '/^[ ]*$$/d' $< | \ + sed -e 's/#.*$$//' -e '/^[ ]*$$/d' $^ | \ while read conf tagos tagver; do \ test `expr '$(config-machine)-$(config-vendor)-$(config-os)' \ : "$$conf"` != 0 || continue; \ @@ -124,7 +129,7 @@ $(objpfx)abi-tag.h: $(..)abi-tags echo "#endif" ) > $@.new; \ done if test -r $@.new; then mv -f $@.new $@; \ - else echo >&2 'This configuration not matched in $<'; exit 1; fi + else echo >&2 'This configuration not matched in $^'; exit 1; fi all-Banner-files = $(wildcard $(addsuffix /Banner,\ $(sort $(subdir-srcdirs) \ |