Update Cabal submodule to latest snapshot
authorHerbert Valerio Riedel <hvr@gnu.org>
Wed, 16 Dec 2015 22:22:42 +0000 (23:22 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Wed, 16 Dec 2015 22:24:09 +0000 (23:24 +0100)
This needs minor adaptations to ghc-cabal due to
http://git.haskell.org/packages/Cabal.git/commitdiff/b39b906d05c409e4960ae15dbaca89664826a85f

libraries/Cabal
utils/ghc-cabal/Main.hs

index 35f50ba..4e33454 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbdb
+Subproject commit 4e33454f5566c1ad3339c4bdf7444dff6c8fc21f
index 6da7733..ad18f2e 100644 (file)
@@ -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