Commit 64e48129 authored by Ben Gamari's avatar Ben Gamari 🐢

SHake

parent f356a437
......@@ -37,7 +37,7 @@ disabledTests = words "hartel last-piece secretary triangle ebnf2ps HMMS PolyGP
-- | These tests are compiled by the Makefile system, but don't work for me (mostly GHC 7.4 breaks)
newlyDisabledTests :: [String]
newlyDisabledTests = words "power lift fulsom fluid"
newlyDisabledTests = words "power lift fulsom fluid eff"
-- | Directories containing tests that the system can run.
......@@ -193,7 +193,7 @@ buildRules Build{..} = do
"//config.txt" %> \out -> do
let dir = unoutput out
src <- readFileLines $ dir </> "Makefile"
let poss = ["Main.hs","Main.lhs",takeFileName dir <.> "hs",takeFileName dir <.> "lhs"]
let poss = ["Main.hs","Main.lhs","Era.hs","SumEuler.hs",takeFileName dir <.> "hs",takeFileName dir <.> "lhs"]
bs <- filterM (doesFileExist . (dir </>)) poss
let mainMod = case bs of
[] -> error $ "Could not find Main file for " ++ dir
......@@ -211,7 +211,7 @@ buildRules Build{..} = do
name = takeFileName dir
putNormal $ "==nofib== " ++ name ++ " : time to link " ++ name ++ " follows..."
withResource r 1 $
cmd_ compiler $ ["-Rghc-timing","-rtsopts","-o"++out] ++ os ++ way ++ words (config "SRC_HC_OPTS")
cmd_ compiler $ ["-Rghc-timing","-rtsopts","-o", out] ++ os ++ way ++ words (config "SRC_HC_OPTS")
putNormal $ "==nofib== " ++ name ++ ": size of " ++ name ++ " follows..."
cmd_ "size" [out]
......@@ -236,7 +236,7 @@ buildRules Build{..} = do
"//Main.deps" %> \out -> do
let dir = unoutput out
config <- readConfig' $ takeDirectory out </> "config.txt"
cmd_ compiler $ ["-w","-M",dir </> config "MAIN","-i" ++ dir,"-dep-makefile=" ++ out] ++
cmd_ compiler $ ["-w","-M",dir </> config "MAIN","-i" ++ dir,"-dep-makefile=" ++ out, "-dep-suffix", ""] ++
words (config "SRC_HC_OPTS")
src <- liftIO $ readFile out
need [x | x <- words src, takeExtension x `elem` [".hs",".lhs",".h"]]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment