From 1289048eaf31915b9335c6f7e0b7b64625ab0ed5 Mon Sep 17 00:00:00 2001 From: Herbert Valerio Riedel Date: Mon, 19 Jan 2015 12:18:02 +0100 Subject: Fix bad '... \\' escape in ghcversion.h generation Today I learned about the peculiarities of escaping within single-quotes: Turns out, echo 'foo \\' emits foo \\ rather than escaping the '\'. Curiously, if you need to escape a ' within single-quotes, here's how to do it echo 'foo '\'' bar' which will emit foo ' bar This fixes #10002 --- includes/ghc.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'includes/ghc.mk') diff --git a/includes/ghc.mk b/includes/ghc.mk index c7cec6c948..7a255db601 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -71,12 +71,12 @@ $(includes_H_VERSION) : mk/project.mk | $$(dir $$@)/. echo "#define __GLASGOW_HASKELL_PATCHLEVEL2__ $(ProjectPatchLevel2)" >> $@; \ fi @echo >> $@ - @echo '#define MIN_VERSION_GLASGOW_HASKELL(ma,mi,pl1,pl2) (\\' >> $@ - @echo ' ((ma)*100+(mi)) < __GLASGOW_HASKELL__ || \\' >> $@ - @echo ' ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \\' >> $@ - @echo ' && (pl1) < __GLASGOW_HASKELL_PATCHLEVEL1__ || \\'>> $@ - @echo ' ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \\' >> $@ - @echo ' && (pl1) == __GLASGOW_HASKELL_PATCHLEVEL1__ \\' >> $@ + @echo '#define MIN_VERSION_GLASGOW_HASKELL(ma,mi,pl1,pl2) (\' >> $@ + @echo ' ((ma)*100+(mi)) < __GLASGOW_HASKELL__ || \' >> $@ + @echo ' ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \' >> $@ + @echo ' && (pl1) < __GLASGOW_HASKELL_PATCHLEVEL1__ || \' >> $@ + @echo ' ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \' >> $@ + @echo ' && (pl1) == __GLASGOW_HASKELL_PATCHLEVEL1__ \' >> $@ @echo ' && (pl2) <= __GLASGOW_HASKELL_PATCHLEVEL2__ )' >> $@ @echo >> $@ @echo "#endif /* __GHCVERSION_H__ */" >> $@ -- cgit v1.2.1