From e8c910d958eac019957f85b46d812e50b3a22f1d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 9 Jun 2014 12:37:22 +0300 Subject: [PATCH 1/2] ghc 7.8.3 support #748 --- yesod-bin/GhcBuild.hs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yesod-bin/GhcBuild.hs b/yesod-bin/GhcBuild.hs index d50c77ed..04410002 100644 --- a/yesod-bin/GhcBuild.hs +++ b/yesod-bin/GhcBuild.hs @@ -151,7 +151,9 @@ buildPackage' argv2 ld ar = do haskellish (f,Nothing) = looksLikeModuleName f || isHaskellSrcFilename f || '.' `notElem` f haskellish (_,Just phase) = -#if MIN_VERSION_ghc(7,4,0) +#if MIN_VERSION_ghc(7,8,3) + phase `notElem` [As True, As False, Cc, Cobjc, Cobjcpp, CmmCpp, Cmm, StopLn] +#elif MIN_VERSION_ghc(7,4,0) phase `notElem` [As, Cc, Cobjc, Cobjcpp, CmmCpp, Cmm, StopLn] #else phase `notElem` [As, Cc, CmmCpp, Cmm, StopLn] @@ -301,7 +303,11 @@ mode_flags = , Flag "E" (PassFlag (setMode (stopBeforeMode anyHsc))) , Flag "C" (PassFlag (\f -> do setMode (stopBeforeMode HCc) f addFlag "-fvia-C" f)) +#if MIN_VERSION_ghc(7,8,3) + , Flag "S" (PassFlag (setMode (stopBeforeMode (As True)))) +#else , Flag "S" (PassFlag (setMode (stopBeforeMode As))) +#endif , Flag "-make" (PassFlag (setMode doMakeMode)) , Flag "-interactive" (PassFlag (setMode doInteractiveMode)) , Flag "-abi-hash" (PassFlag (setMode doAbiHashMode)) From 32e729fdb32f774a44d29f1fca592675cae90834 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 9 Jun 2014 13:36:13 +0300 Subject: [PATCH 2/2] Version bump --- yesod-bin/yesod-bin.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 24356f60..7b9408a9 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.2.10.1 +version: 1.2.10.2 license: MIT license-file: LICENSE author: Michael Snoyman