diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2017-04-26 15:26:56 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-04-26 15:27:29 -0400 |
| commit | 579bb7669f40ed01841dd197ee535cf26fa19580 (patch) | |
| tree | bbc8f776648cda12537d10a8f747e6e91dbe74ef /compiler | |
| parent | 350d268aa62543097d8ae3f81a7adf0d635d6688 (diff) | |
| download | haskell-579bb7669f40ed01841dd197ee535cf26fa19580.tar.gz | |
Update Cabal submodule, with necessary wibbles.
Test Plan: validate
Reviewers: bgamari, austin
Reviewed By: bgamari
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3501
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/backpack/DriverBkp.hs | 3 | ||||
| -rw-r--r-- | compiler/main/Packages.hs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/compiler/backpack/DriverBkp.hs b/compiler/backpack/DriverBkp.hs index d85b80dbc2..db7b5f63bc 100644 --- a/compiler/backpack/DriverBkp.hs +++ b/compiler/backpack/DriverBkp.hs @@ -308,8 +308,7 @@ buildUnit session cid insts lunit = do packageName = compat_pn, packageVersion = makeVersion [0], unitId = toInstalledUnitId (thisPackage dflags), - mungedPackageName = Nothing, - libName = Nothing, + sourceLibName = Nothing, componentId = cid, instantiatedWith = insts, -- Slight inefficiency here haha diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs index 10ef0d42ec..2c5833fae4 100644 --- a/compiler/main/Packages.hs +++ b/compiler/main/Packages.hs @@ -1940,7 +1940,7 @@ componentIdString :: DynFlags -> ComponentId -> Maybe String componentIdString dflags cid = do conf <- lookupInstalledPackage dflags (componentIdToInstalledUnitId cid) return $ - case libName conf of + case sourceLibName conf of Nothing -> sourcePackageIdString conf Just (PackageName libname) -> packageNameString conf |