diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-11-29 16:51:41 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-11-29 16:51:41 +0000 |
| commit | ae968f8b673c6328db2172ad0e00733d3eb69de4 (patch) | |
| tree | 7b857619dbbfae05556e9cc6b3931beef643a2ea /utils | |
| parent | 95b63cae3cab95449893518f6c99929999055423 (diff) | |
| download | haskell-ae968f8b673c6328db2172ad0e00733d3eb69de4.tar.gz | |
Follow Cabal changes
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.hs | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs index ca26ca4479..c3a4789089 100644 --- 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, - programArgs = ["-B" ++ topdir], + programDefaultArgs = ["-B" ++ topdir], + programOverrideArgs = [], 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 [], + programOverrideArgs = [], programLocation = UserSpecified ghcpkg } stripProg = ConfiguredProgram { programId = programName stripProgram, programVersion = Nothing, - programArgs = [], + programDefaultArgs = [], + programOverrideArgs = [], 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 ++ "_HC_OPTS = " ++ escape (unwords - (programArgs ghcProg + variablePrefix ++ "_HC_OPTS = " ++ escape (unwords + ( programDefaultArgs ghcProg ++ 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), |