[commit: ghc] master: Correctly handle wired in unit IDs in -instantiated-with (852a43f)

[git at git.haskell.org]

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

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

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

commit 852a43f360af09416d15777c8f10d704b5423a96
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sun Mar 26 14:06:12 2017 -0700

    Correctly handle wired in unit IDs in -instantiated-with
    
    Summary:
    To handle wired in packages, we must rewrite all occurrences
    of unit ids like base-4.9.0.0 to base.  However, I forgot
    to do this on unit ids that occurred in unit identifiers
    passed via -instantiated-with.  This patch handles that case,
    plus a test.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: bgamari, austin
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3385


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

852a43f360af09416d15777c8f10d704b5423a96
 compiler/main/Packages.hs                          | 54 ++++++++++++++--------
 testsuite/tests/backpack/cabal/bkpcabal07/M.hs     |  1 +
 .../cabal/{bkpcabal04 => bkpcabal07}/Makefile      | 17 ++-----
 .../cabal/{bkpcabal06/sig => bkpcabal07}/P.hsig    |  1 -
 .../cabal/{bkpcabal01 => bkpcabal07}/Setup.hs      |  0
 testsuite/tests/backpack/cabal/bkpcabal07/all.T    |  9 ++++
 .../bkpcabal07.cabal}                              | 15 ++----
 7 files changed, 54 insertions(+), 43 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 852a43f360af09416d15777c8f10d704b5423a96