diff options
| author | Karel Gardas <karel.gardas@centrum.cz> | 2014-02-18 09:22:59 +0100 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-02-19 16:32:36 -0600 |
| commit | e638acb6a825559fbd93bdaf8ae2704535c157f1 (patch) | |
| tree | 5244135f3ccad93c3a9c4031613caaffba0d691f | |
| parent | 27fe12856a34488ea94291990238c37e5353d1a3 (diff) | |
| download | haskell-e638acb6a825559fbd93bdaf8ae2704535c157f1.tar.gz | |
fix sed expression in build dependencies rules to work well with non-GNU sed (fixes #8764)
The patch is provided by Christian Maeder <Christian.Maeder@dfki.de>
Signed-off-by: Karel Gardas <karel.gardas@centrum.cz>
Signed-off-by: Austin Seipp <austin@well-typed.com>
| -rw-r--r-- | rules/build-dependencies.mk | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/rules/build-dependencies.mk b/rules/build-dependencies.mk index 79350c053f..cdc1edff56 100644 --- a/rules/build-dependencies.mk +++ b/rules/build-dependencies.mk @@ -53,18 +53,15 @@ 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 ; \ - /hs$$$$/ s/o /hi /g ; \ - /hs$$$$/ s/:/ : %hi: %o / ; \ - /hs$$$$/ s/^/$$$$(eval $$$$(call hi-rule,/ ; \ - /hs$$$$/ s/$$$$/))/ ; \ - /hs-boot$$$$/ p ; \ - /hs-boot$$$$/ s/o-boot /hi-boot /g ; \ - /hs-boot$$$$/ s/:/ : %hi-boot: %o-boot / ; \ - /hs-boot$$$$/ s/^/$$$$(eval $$$$(call hi-rule,/ ; \ - /hs-boot$$$$/ s/$$$$/))/' \ - $$@.tmp2 > $$@ - + sed -e '/hs$$$$/ p' -e '/hs$$$$/ s/o /hi /g' \ + -e '/hs$$$$/ s/:/ : %hi: %o /' \ + -e '/hs$$$$/ s/^/$$$$(eval $$$$(call hi-rule,/' \ + -e '/hs$$$$/ s/$$$$/))/' \ + -e '/hs-boot$$$$/ p' -e '/hs-boot$$$$/ s/o-boot /hi-boot /g' \ + -e '/hs-boot$$$$/ s/:/ : %hi-boot: %o-boot /' \ + -e '/hs-boot$$$$/ s/^/$$$$(eval $$$$(call hi-rule,/' \ + -e '/hs-boot$$$$/ s/$$$$/))/' \ + $$@.tmp2 > $$@ # Some of the C files (directly or indirectly) include the generated # includes files. $$($1_$2_depfile_c_asm) : $$(includes_H_CONFIG) $$(includes_H_PLATFORM) |