diff options
| author | Olivier Hainque <hainque@adacore.com> | 2012-05-16 08:23:58 +0000 |
|---|---|---|
| committer | Olivier Hainque <hainque@gcc.gnu.org> | 2012-05-16 08:23:58 +0000 |
| commit | af0a7a92278e8121c2006e85624da46712b24a49 (patch) | |
| tree | 04c8dd85f25f1bc643cd25a781b2b22e78daf70f /gcc | |
| parent | c39cbb22b0388aa073edd98c3dce7c90d3b5e686 (diff) | |
| download | gcc-af0a7a92278e8121c2006e85624da46712b24a49.zip gcc-af0a7a92278e8121c2006e85624da46712b24a49.tar.gz gcc-af0a7a92278e8121c2006e85624da46712b24a49.tar.bz2 | |
Makefile.in (s-header-vars): Resort to -n instead of trailing -e d in sed invocation.
* Makefile.in (s-header-vars): Resort to -n instead of trailing
-e d in sed invocation.
From-SVN: r187580
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8478f9..e4ba56c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-05-16 Olivier Hainque <hainque@adacore.com> + + * Makefile.in (s-header-vars): Resort to -n instead of trailing + -e d in sed invocation. + 2012-05-16 Hans-Peter Nilsson <hp@axis.com> * doc/tm.texi.in (Type Layout) <SIZE_TYPE>: Update reference to diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 716823b..944436c 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4552,7 +4552,12 @@ PLUGIN_HEADERS = $(TREE_H) $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ # generate the 'build fragment' b-header-vars s-header-vars: Makefile rm -f tmp-header-vars - $(foreach header_var,$(shell sed < Makefile -e 's/^\([A-Z0-9_]*_H\)[ ]*=.*/\1/p' -e d),echo $(header_var)=$(shell echo $($(header_var):$(srcdir)/%=.../%) | sed -e 's~\.\.\./config/~config/~' -e 's~\.\.\..*/~~') >> tmp-header-vars;) \ +# The first sed gets the list "header variables" as the list variables +# assigned in Makefile and having _H at the end of the name. "sed -n" proved +# more portable than a trailing "-e d" to filter out the uninteresting lines, +# in particular on ia64-hpux where "s/.../p" only prints if -n was requested +# as well. + $(foreach header_var,$(shell sed < Makefile -n -e 's/^\([A-Z0-9_]*_H\)[ ]*=.*/\1/p'),echo $(header_var)=$(shell echo $($(header_var):$(srcdir)/%=.../%) | sed -e 's~\.\.\./config/~config/~' -e 's~\.\.\..*/~~') >> tmp-header-vars;) \ $(SHELL) $(srcdir)/../move-if-change tmp-header-vars b-header-vars $(STAMP) s-header-vars |