projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
95b63ca
)
Follow Cabal changes
author
Ian Lynagh
<igloo@earth.li>
Sun, 29 Nov 2009 16:51:41 +0000
(16:51 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 29 Nov 2009 16:51:41 +0000
(16:51 +0000)
utils/ghc-cabal/ghc-cabal.hs
patch
|
blob
|
history
diff --git
a/utils/ghc-cabal/ghc-cabal.hs
b/utils/ghc-cabal/ghc-cabal.hs
index
ca26ca4
..
c3a4789
100644
(file)
--- a/
utils/ghc-cabal/ghc-cabal.hs
+++ b/
utils/ghc-cabal/ghc-cabal.hs
@@
-206,24
+206,27
@@
doInstall ghc ghcpkg strip topdir directory distDir
ghcProg = ConfiguredProgram {
programId = programName ghcProgram,
programVersion = Nothing,
ghcProg = ConfiguredProgram {
programId = programName ghcProgram,
programVersion = Nothing,
- programArgs = ["-B" ++ topdir],
+ programDefaultArgs = ["-B" ++ topdir],
+ programOverrideArgs = [],
programLocation = UserSpecified ghc
}
ghcpkgconf = topdir </> "package.conf.d"
ghcPkgProg = ConfiguredProgram {
programId = programName ghcPkgProgram,
programVersion = Nothing,
programLocation = UserSpecified ghc
}
ghcpkgconf = topdir </> "package.conf.d"
ghcPkgProg = ConfiguredProgram {
programId = programName ghcPkgProgram,
programVersion = Nothing,
- programArgs = ["--global-conf",
- ghcpkgconf]
+ programDefaultArgs = ["--global-conf",
+ ghcpkgconf]
++ if not (null myDestDir)
then ["--force"]
else [],
++ if not (null myDestDir)
then ["--force"]
else [],
+ programOverrideArgs = [],
programLocation = UserSpecified ghcpkg
}
stripProg = ConfiguredProgram {
programId = programName stripProgram,
programVersion = Nothing,
programLocation = UserSpecified ghcpkg
}
stripProg = ConfiguredProgram {
programId = programName stripProgram,
programVersion = Nothing,
- programArgs = [],
+ programDefaultArgs = [],
+ programOverrideArgs = [],
programLocation = UserSpecified strip
}
progs' = updateProgram ghcProg
programLocation = UserSpecified strip
}
progs' = updateProgram ghcProg
@@
-367,10
+370,11
@@
generate config_args distdir directory
variablePrefix ++ "_CMM_SRCS = $(addprefix cbits/,$(notdir $(wildcard " ++ directory ++ "/cbits/*.cmm)))",
-- XXX This includes things it shouldn't, like:
-- -odir dist-bootstrapping/build
variablePrefix ++ "_CMM_SRCS = $(addprefix cbits/,$(notdir $(wildcard " ++ directory ++ "/cbits/*.cmm)))",
-- XXX This includes things it shouldn't, like:
-- -odir dist-bootstrapping/build
- variablePrefix ++ "_HC_OPTS = " ++ escape (unwords
- (programArgs ghcProg
+ variablePrefix ++ "_HC_OPTS = " ++ escape (unwords
+ ( programDefaultArgs ghcProg
++ hcOptions GHC bi
++ hcOptions GHC bi
- ++ extensionsToFlags (compiler lbi) (extensions bi))),
+ ++ extensionsToFlags (compiler lbi) (extensions bi)
+ ++ programOverrideArgs ghcProg)),
variablePrefix ++ "_CC_OPTS = " ++ unwords (ccOptions bi),
variablePrefix ++ "_CPP_OPTS = " ++ unwords (cppOptions bi),
variablePrefix ++ "_LD_OPTS = " ++ unwords (ldOptions bi),
variablePrefix ++ "_CC_OPTS = " ++ unwords (ccOptions bi),
variablePrefix ++ "_CPP_OPTS = " ++ unwords (cppOptions bi),
variablePrefix ++ "_LD_OPTS = " ++ unwords (ldOptions bi),