[kaya] Another trial to fix an issue in Driver.hs
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Aug 28 09:37:47 UTC 2013
commit 90fbb8bd9ac36853397c62ed7290caa0bcde18ee
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Wed Aug 28 11:37:33 2013 +0200
Another trial to fix an issue in Driver.hs
kaya-0.5.2-ghc76.patch | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/kaya-0.5.2-ghc76.patch b/kaya-0.5.2-ghc76.patch
index 3312df1..0d39325 100644
--- a/kaya-0.5.2-ghc76.patch
+++ b/kaya-0.5.2-ghc76.patch
@@ -21,7 +21,7 @@ diff -up kaya-0.5.2/compiler/CodegenCPP.hs.ghc76 kaya-0.5.2/compiler/CodegenCPP.
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-28 10:49:13.719430389 +0200
-+++ kaya-0.5.2/compiler/Driver.hs 2013-08-28 11:09:33.519884124 +0200
++++ kaya-0.5.2/compiler/Driver.hs 2013-08-28 11:36:40.662637353 +0200
@@ -37,6 +37,7 @@ import System.Random
import System.IO
import Debug.Trace
@@ -30,17 +30,17 @@ diff -up kaya-0.5.2/compiler/Driver.hs.ghc76 kaya-0.5.2/compiler/Driver.hs
import Control.Monad
-- Compile a file, with extra options to gcc, and main options. Returns the
-@@ -67,8 +68,8 @@ compileFile prtype modname fn extra opts
- -- lazy)
+@@ -68,8 +69,8 @@ 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)
+ compile newroot libdirs opts pt extra mainfile)
- (\e -> do putStrLn (show e)
-+ in compile newroot libdirs opts pt extra mainfile)
+- return CompError)
+ (\ (e :: SomeException) -> do putStrLn (show e)
- return CompError)
++ return CompError)
outputfile Module mod = showuser mod ++ ".o"
+ -- TMP HACK: This should probably be a %extension "cgi" directive in the .ks
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-28 10:49:13.738429149 +0200
+++ kaya-0.5.2/compiler/Module.hs 2013-08-28 10:49:13.774426798 +0200
More information about the scm-commits
mailing list