[commit: packages/Cabal] ghc-head: Merge pull request #1440 from 23Skidoo/ghc-info-ignore-ghc-options (473f76a)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=473f76a4d17104743e876189a2ef7be9cc43c825

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

commit 473f76a4d17104743e876189a2ef7be9cc43c825
Merge: 85cb83d d9283d2
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Mon Aug 26 13:03:49 2013 -0700

    Merge pull request #1440 from 23Skidoo/ghc-info-ignore-ghc-options
    
    Ignore 'ghc-options' when parsing 'ghc --info' output.



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

473f76a4d17104743e876189a2ef7be9cc43c825
 Cabal/Distribution/Simple/GHC.hs           |   36 +++++++++++++++-------------
 Cabal/Distribution/Simple/Program.hs       |    1 +
 Cabal/Distribution/Simple/Program/Types.hs |    8 ++++++-
 3 files changed, 27 insertions(+), 18 deletions(-)