From 136fa403aab0d5b23f9819fee9bac3c94693fc77 Mon Sep 17 00:00:00 2001 From: hainque Date: Wed, 16 May 2012 08:23:58 +0000 Subject: [PATCH] * Makefile.in (s-header-vars): Resort to -n instead of trailing -e d in sed invocation. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187580 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 +++++ gcc/Makefile.in | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a8478f92f0c..e4ba56cd11d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-05-16 Olivier Hainque + + * Makefile.in (s-header-vars): Resort to -n instead of trailing + -e d in sed invocation. + 2012-05-16 Hans-Peter Nilsson * doc/tm.texi.in (Type Layout) : Update reference to diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 716823b2850..944436c7a81 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 -- 2.11.4.GIT