aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2019-02-14 01:05:12 +0100
committerDaniel Gröber <dxld@darkboxed.org>2019-02-14 01:05:12 +0100
commit47e9af464549ddec94a992d9f9e7ae12a96e64e8 (patch)
treefdb4760672b34de97d55120462723c8f69b57bff /src
parent698170143d5a86cf13a1ff7816439eb90a1e4c99 (diff)
Sync with Cabal HEAD
Diffstat (limited to 'src')
-rw-r--r--src/CabalHelper/Runtime/Compat.hs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/CabalHelper/Runtime/Compat.hs b/src/CabalHelper/Runtime/Compat.hs
index 21d4efd..0c5a895 100644
--- a/src/CabalHelper/Runtime/Compat.hs
+++ b/src/CabalHelper/Runtime/Compat.hs
@@ -185,8 +185,7 @@ unUnqualComponentName' = id
componentNameFromComponent :: Component -> ComponentName
#if CH_MIN_VERSION_Cabal(2,5,0)
-componentNameFromComponent (CLib Library { libName = Nothing }) = CLibName LMainLibName
-componentNameFromComponent (CLib Library { libName = Just n }) = CLibName $ LSubLibName n
+componentNameFromComponent (CLib Library { libName = n }) = CLibName n
componentNameFromComponent (CFLib ForeignLib {..}) = CFLibName foreignLibName
#elif CH_MIN_VERSION_Cabal(1,25,0)
-- CPP >= 1.25 (redundant)