diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-05-25 23:27:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-05-25 23:27:48 -0400 |
| commit | d949ddf1adc826c53248dffa933fcdc5593083ef (patch) | |
| tree | 77bfa8739fc581970cfecd17d37e045896e3c4ea | |
| parent | 3761d7e88b0504ed7970d2caa16be95846fef052 (diff) | |
proper fix for "foo"# -- need MagicHash extension
| -rw-r--r-- | Build/EvilSplicer.hs | 6 | ||||
| -rw-r--r-- | Makefile | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs index 0f0548917..bcffa3866 100644 --- a/Build/EvilSplicer.hs +++ b/Build/EvilSplicer.hs @@ -301,7 +301,6 @@ expandExpressionSplice sp lls = concat [before, spliced:padding, end] {- Tweaks code output by GHC in splices to actually build. Yipes. -} mangleCode :: String -> String mangleCode = flip_colon - . remove_weird_string_hash . remove_unnecessary_type_signatures . lambdaparenhack . lambdaparens @@ -550,11 +549,6 @@ mangleCode = flip_colon - The ; is added by case_layout. -} flip_colon = replace "; : _ " "; _ : " - {- Sometimes a string will end with ".."#, and the hash needs to be - - removed. - -} - remove_weird_string_hash = replace "\"#" "\"" - {- This works around a problem in the expanded template haskell for Yesod - type-safe url rendering. - @@ -186,7 +186,7 @@ no-th-webapp-stage1: Build/EvilSplicer # Some additional dependencies needed by the expanded splices. sed -i 's/^ Build-Depends: / Build-Depends: yesod-routes, yesod-core, shakespeare-css, shakespeare-js, shakespeare, blaze-markup, file-embed, wai-app-static, /' tmp/no-th-tree/git-annex.cabal # Avoid warnings due to sometimes unused imports added for the splices. - sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/no-th-tree/git-annex.cabal + sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports -XMagicHash /i' tmp/no-th-tree/git-annex.cabal # Run on the arm system, after stage1 no-th-webapp-stage2: @@ -215,7 +215,7 @@ android: Build/EvilSplicer # Some additional dependencies needed by the expanded splices. sed -i 's/^ Build-Depends: / Build-Depends: yesod-routes, yesod-core, shakespeare-css, shakespeare-js, shakespeare, blaze-markup, file-embed, wai-app-static, /' tmp/androidtree/git-annex.cabal # Avoid warnings due to sometimes unused imports added for the splices. - sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports /i' tmp/androidtree/git-annex.cabal + sed -i 's/GHC-Options: \(.*\)-Wall/GHC-Options: \1-Wall -fno-warn-unused-imports -XMagicHash /i' tmp/androidtree/git-annex.cabal # Cabal cannot cross compile with custom build type, so workaround. sed -i 's/Build-type: Custom/Build-type: Simple/' tmp/androidtree/git-annex.cabal # Build just once, but link twice, for 2 different versions of Android. |