Commit e4ae0eb2 authored by Duncan Coutts's avatar Duncan Coutts
Browse files

Don't redundantly pass programArgs in when calling programs.

That's already done by the Program framework so we were passing
those extra args in twice.
parent eea57172
...@@ -688,9 +688,6 @@ ghcOptions lbi bi odir ...@@ -688,9 +688,6 @@ ghcOptions lbi bi odir
NoOptimisation -> [] NoOptimisation -> []
NormalOptimisation -> ["-O"] NormalOptimisation -> ["-O"]
MaximumOptimisation -> ["-O2"]) MaximumOptimisation -> ["-O2"])
++ (case lookupProgram ghcProgram (withPrograms lbi) of
Just p -> programArgs p
Nothing -> [])
++ hcOptions GHC bi ++ hcOptions GHC bi
++ extensionsToFlags c (extensions bi) ++ extensionsToFlags c (extensions bi)
where c = compiler lbi where c = compiler lbi
...@@ -755,9 +752,9 @@ makefile pkg_descr lbi flags = do ...@@ -755,9 +752,9 @@ makefile pkg_descr lbi flags = do
("WAYS", (if withProfLib lbi then "p " else "") ++ (if withSharedLib lbi then "dyn" else "")), ("WAYS", (if withProfLib lbi then "p " else "") ++ (if withSharedLib lbi then "dyn" else "")),
("odir", builddir), ("odir", builddir),
("package", packageIdStr), ("package", packageIdStr),
("GHC_OPTS", unwords ( ("GHC_OPTS", unwords $ programArgs ghcProg
["-package-name", packageIdStr ] ++ ["-package-name", packageIdStr ]
++ ghcOptions lbi bi (buildDir lbi))), ++ ghcOptions lbi bi (buildDir lbi)),
("MAKEFILE", file), ("MAKEFILE", file),
("C_SRCS", unwords (cSources bi)), ("C_SRCS", unwords (cSources bi)),
("GHC_CC_OPTS", unwords (ghcCcOptions lbi bi (buildDir lbi))), ("GHC_CC_OPTS", unwords (ghcCcOptions lbi bi (buildDir lbi))),
......
...@@ -233,7 +233,6 @@ haddock pkg_descr lbi suffixes flags = do ...@@ -233,7 +233,6 @@ haddock pkg_descr lbi suffixes flags = do
++ cssFileFlag ++ cssFileFlag
++ linkToHscolour ++ linkToHscolour
++ packageFlags ++ packageFlags
++ programArgs confHaddock
++ verboseFlags ++ verboseFlags
++ hideArgs ++ hideArgs
++ exportsFlags ++ exportsFlags
...@@ -270,7 +269,6 @@ haddock pkg_descr lbi suffixes flags = do ...@@ -270,7 +269,6 @@ haddock pkg_descr lbi suffixes flags = do
, "--prologue=" ++ prologFileName ] , "--prologue=" ++ prologFileName ]
++ linkToHscolour ++ linkToHscolour
++ packageFlags ++ packageFlags
++ programArgs confHaddock
++ verboseFlags ++ verboseFlags
++ exportsFlags ++ exportsFlags
++ haddock2options bi preprocessDir ++ haddock2options bi preprocessDir
......
Supports Markdown
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