[PATCH 2/2] use detected GNU sed on expression where Solaris' fails.

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] use detected GNU sed on expression where Solaris' fails.

Karel Gardas
We set SED make variable to configure detected GNU sed command for quite
some time now, but surprisingly it is not used in other makefiles. Anyway,
this patch fixes a real issue on Solaris 10 where distributed Sun/Oracle
sed is not able to cope with required expression, but GNU sed is.
The patch is minimal to lower the risk of breakage, but the other approach
of fixing all occurrences of `sed' to `$(SED)' is of course also possible.
---
 rules/build-dependencies.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk
index 79350c0..896efa8 100644
--- a/rules/build-dependencies.mk
+++ b/rules/build-dependencies.mk
@@ -53,7 +53,7 @@ endif
 #     Foo.dyn_o Foo.o : Foo.hs
 # lines, and create corresponding hi-rule lines
 #     <dollar>(eval <dollar>(call hi-rule,Foo.dyn_hi Foo.hi : %hi: %o Foo.hs))
- sed '/hs$$$$/ p                                      ; \
+ $(SED) '/hs$$$$/ p                                      ; \
      /hs$$$$/ s/o /hi /g                             ; \
      /hs$$$$/ s/:/ : %hi: %o /                       ; \
      /hs$$$$/ s/^/$$$$(eval $$$$(call hi-rule,/      ; \
--
1.8.1.4