[commit: ghc] master: Update Cabal submodule to latest snapshot (b35cc1f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b35cc1fb649173c2aea59b98640c026f30960219/ghc

>---------------------------------------------------------------

commit b35cc1fb649173c2aea59b98640c026f30960219
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 23:22:42 2015 +0100

    Update Cabal submodule to latest snapshot
    
    This needs minor adaptations to ghc-cabal due to
    http://git.haskell.org/packages/Cabal.git/commitdiff/b39b906d05c409e4960ae15dbaca89664826a85f


>---------------------------------------------------------------

b35cc1fb649173c2aea59b98640c026f30960219
 libraries/Cabal         | 2 +-
 utils/ghc-cabal/Main.hs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 35f50ba..4e33454 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbdb
+Subproject commit 4e33454f5566c1ad3339c4bdf7444dff6c8fc21f
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 6da7733..ad18f2e 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