[kaya] Fix issue in Driver.hs

Jochen Schmitt s4504kr at fedoraproject.org
Tue Aug 27 20:16:52 UTC 2013


commit 78cec55b728788864ac6d4599bf2a1cb5109d57f
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Aug 27 22:16:39 2013 +0200

    Fix issue in Driver.hs

 kaya-0.5.2-ghc76.patch |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/kaya-0.5.2-ghc76.patch b/kaya-0.5.2-ghc76.patch
index f2c7615..a3af264 100644
--- a/kaya-0.5.2-ghc76.patch
+++ b/kaya-0.5.2-ghc76.patch
@@ -19,6 +19,26 @@ diff -up kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 kaya-0.5.2/compiler/CodegenCPP.
  
  writecpp :: [CompileResult] -> [Output]
  writecpp [] = []
+diff -up kaya-0.5.2/compiler/Driver.hs.ghc76 kaya-0.5.2/compiler/Driver.hs
+--- kaya-0.5.2/compiler/Driver.hs.ghc76	2013-08-27 22:10:31.976436068 +0200
++++ kaya-0.5.2/compiler/Driver.hs	2013-08-27 22:12:10.777896529 +0200
+@@ -37,6 +37,7 @@ import System.Random
+ import System.IO
+ import Debug.Trace
+ import Data.List
++import Control.Exception
+ import Control.Monad
+ 
+ -- Compile a file, with extra options to gcc, and main options. Returns the
+@@ -68,7 +69,7 @@ compileFile prtype modname fn extra opts
+        catch (do startup <- getStartup prtype libdirs
+                  let pt = addToPT (parse newroot libdirs (prog++startup) fn) pinput 
+                  compile newroot libdirs opts pt extra mainfile)
+-             (\e -> do putStrLn (show e)
++             (\ (e :: SomeException) -> do putStrLn (show e)
+                        return CompError)
+ 
+ outputfile Module mod = showuser mod ++ ".o"
 diff -up kaya-0.5.2/compiler/Module.hs.ghc76 kaya-0.5.2/compiler/Module.hs
 --- kaya-0.5.2/compiler/Module.hs.ghc76	2013-08-27 21:33:00.658326051 +0200
 +++ kaya-0.5.2/compiler/Module.hs	2013-08-27 21:33:00.689323999 +0200


More information about the scm-commits mailing list