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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8478f92f0cbc9ad708fb83bf79184e2b1519a72..e4ba56cd11dcd02c2659bad523bcb60baade58e0 100644 (file)
--- 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 716823b2850d6e06d601286f7b743ec8f3191908..944436c7a814dc208991cc5e8237ec2c419a9b59 100644 (file)
--- 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