diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-16 23:22:42 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-16 23:24:09 +0100 |
| commit | b35cc1fb649173c2aea59b98640c026f30960219 (patch) | |
| tree | ec6871aa9150588d1e2bcfd344a0ebb6a92c2170 | |
| parent | 046b47ab5a077e76abd9610946428419cfe82ca9 (diff) | |
| download | haskell-b35cc1fb649173c2aea59b98640c026f30960219.tar.gz | |
Update Cabal submodule to latest snapshot
This needs minor adaptations to ghc-cabal due to
http://git.haskell.org/packages/Cabal.git/commitdiff/b39b906d05c409e4960ae15dbaca89664826a85f
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbd +Subproject 4e33454f5566c1ad3339c4bdf7444dff6c8fc21 diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 6da7733cad..ad18f2e1fc 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -167,7 +167,7 @@ doCopy directory distDir (installDirTemplates lbi) progs = withPrograms lbi stripProgram' = stripProgram { - programFindLocation = \_ _ -> return (Just strip) } + programFindLocation = \_ _ -> return (Just (strip,[])) } progs' <- configureProgram verbosity stripProgram' progs let lbi' = lbi { @@ -216,12 +216,12 @@ doRegister directory distDir ghc ghcpkg topdir ghcpkgconf = topdir </> "package.conf.d" ghcProgram' = ghcProgram { programPostConf = \_ cp -> return cp { programDefaultArgs = ["-B" ++ topdir] }, - programFindLocation = \_ _ -> return (Just ghc) } + programFindLocation = \_ _ -> return (Just (ghc,[])) } ghcPkgProgram' = ghcPkgProgram { programPostConf = \_ cp -> return cp { programDefaultArgs = ["--global-package-db", ghcpkgconf] ++ ["--force" | not (null myDestDir) ] }, - programFindLocation = \_ _ -> return (Just ghcpkg) } + programFindLocation = \_ _ -> return (Just (ghcpkg,[])) } configurePrograms ps conf = foldM (flip (configureProgram verbosity)) conf ps progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs |