X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fghc-cabal%2Fghc-cabal.hs;h=c3a478908919c87c6a264ddb7efbe67c5894dbe3;hb=ae968f8b673c6328db2172ad0e00733d3eb69de4;hp=b940a2dff561f6a9b0755d38021509c5407205b5;hpb=7f4b8d9bfbfb0556d51ba1fb25f18e424bd5bf9c;p=ghc-hetmet.git diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs index b940a2d..c3a4789 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 @@ -310,7 +313,10 @@ generate config_args distdir directory let ipid = InstalledPackageId (display (packageId pd) ++ "-inplace") let installedPkgInfo = inplaceInstalledPackageInfo cwd distdir pd lib lbi clbi - final_ipi = installedPkgInfo{ Installed.installedPackageId = ipid } + final_ipi = installedPkgInfo { + Installed.installedPackageId = ipid, + Installed.haddockHTMLs = ["../" ++ display (packageId pd)] + } content = Installed.showInstalledPackageInfo final_ipi ++ "\n" writeFileAtomic (distdir "inplace-pkg-config") content _ -> error "Inconsistent lib components; can't happen?" @@ -364,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),