diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-15 11:09:45 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-04-16 17:00:40 +0200 |
| commit | 8992d5269804b727fb77249511e89df678526907 (patch) | |
| tree | d39461686c7a22c8415b0a8dd630a4457a983ba7 /utils/ghctags/Main.hs | |
| parent | a107737f84f6738a9fa572ec9c5da49c9db8a8b5 (diff) | |
| download | haskell-8992d5269804b727fb77249511e89df678526907.tar.gz | |
Update Cabal submodule to tip of v1.20 branch
This corresponds to the RC of the soon-to-be Cabal 1.20 release
One noteworthy change is the removal of the `--with-ranlib` flag
requiring a small adaptation in the GHC build system.
Moreover two new licences were added, MPL and BSD2.
Due to https://github.com/haskell/cabal/issues/1622 Cabal-1.20 now
allows to strip libraries as well, this doesn't work well with
`ghc-cabal copy` being fed a `":"` strip-command argument which was
simply ignored in the past. The current code tries to retain this
semantics as backward compat. However, this needs more investigation as
I'm not sure if/why the `test_bindist` step doesn't want the libraries
to be stripped on installation.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
Diffstat (limited to 'utils/ghctags/Main.hs')
| -rw-r--r-- | utils/ghctags/Main.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/utils/ghctags/Main.hs b/utils/ghctags/Main.hs index 9bf1a2d0c3..a67891e16a 100644 --- a/utils/ghctags/Main.hs +++ b/utils/ghctags/Main.hs @@ -20,7 +20,6 @@ import SrcLoc import Distribution.Simple.GHC ( componentGhcOptions ) import Distribution.Simple.Configure ( getPersistBuildConfig ) -import Distribution.Simple.Compiler ( compilerVersion ) import Distribution.Simple.Program.GHC ( renderGhcOptions ) import Distribution.PackageDescription ( library, libBuildInfo ) import Distribution.Simple.LocalBuildInfo @@ -191,8 +190,7 @@ flagsFromCabal distPref = do let bi = libBuildInfo lib odir = buildDir lbi opts = componentGhcOptions V.normal lbi bi clbi odir - version = compilerVersion (compiler lbi) - in return $ renderGhcOptions version opts + in return $ renderGhcOptions (compiler lbi) opts _ -> error "no library" ---------------------------------------------------------------- |