Commit d0b8a0eb authored by Andreas Klebinger's avatar Andreas Klebinger

shake: Remove linker resource.

Linking different files at the same time is fine
after all.
parent 68b4e7bb
...@@ -187,7 +187,6 @@ main = do ...@@ -187,7 +187,6 @@ main = do
-- Main.o object files (I think ghc -M gets these wrong). -- Main.o object files (I think ghc -M gets these wrong).
buildRules :: Nofib -> Rules () buildRules :: Nofib -> Rules ()
buildRules nofib@Build{..} = do buildRules nofib@Build{..} = do
linkerResource <- newResource "ghc linker" 5
pkgDbResource <- newResource "package db" 1 pkgDbResource <- newResource "package db" 1
-- _make/foo/bar -> bar -- _make/foo/bar -> bar
...@@ -332,9 +331,9 @@ buildRules nofib@Build{..} = do ...@@ -332,9 +331,9 @@ buildRules nofib@Build{..} = do
-- Link executable -- Link executable
compileArgs <- getTestCompileArgs nofib test compileArgs <- getTestCompileArgs nofib test
deps_args <- buildDepsArgs test deps_args <- buildDepsArgs test
() <- withResource linkerResource 1 $
-- We pass the compiler_args as well, as we don't distinguish between link and compile time arguments -- We pass the compiler_args as well, as we don't distinguish between link and compile time arguments
cmd compiler $ ["-Rghc-timing","-rtsopts","-o", out] ++ objs ++ compileArgs ++ compiler_args ++ deps_args cmd_ compiler $ ["-Rghc-timing","-rtsopts","-o", out] ++ objs ++ compileArgs ++ compiler_args ++ deps_args
-- Report executable size -- Report executable size
Stdout out_err <- cmd "size" [out] Stdout out_err <- cmd "size" [out]
......
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