diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2018-12-15 23:18:41 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2019-01-22 03:06:51 +0100 |
| commit | 0d2011d04fd06fc6bb21407d2f412439668b6249 (patch) | |
| tree | 30a959965aa8573762836a6dc29c9521f12c2fe7 /src/CabalHelper/Runtime/Compat.hs | |
| parent | 66ff20ada55558ab1fda09f22f4f6f6de0736136 (diff) | |
Sync with Cabal HEAD
Diffstat (limited to 'src/CabalHelper/Runtime/Compat.hs')
| -rw-r--r-- | src/CabalHelper/Runtime/Compat.hs | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/CabalHelper/Runtime/Compat.hs b/src/CabalHelper/Runtime/Compat.hs index eb87163..21d4efd 100644 --- a/src/CabalHelper/Runtime/Compat.hs +++ b/src/CabalHelper/Runtime/Compat.hs @@ -133,6 +133,12 @@ import Distribution.Types.GenericPackageDescription ) #endif +#if CH_MIN_VERSION_Cabal(2,5,0) +import Distribution.Types.LibraryName + ( LibraryName (..) + ) +#endif + import CabalHelper.Shared.Common import CabalHelper.Shared.InterfaceTypes @@ -150,9 +156,16 @@ type UnitId = InstalledPackageId componentNameToCh :: ComponentName -> ChComponentName +#if CH_MIN_VERSION_Cabal(2,5,0) +componentNameToCh (CLibName LMainLibName) = ChLibName ChMainLibName +componentNameToCh (CLibName (LSubLibName n)) = ChLibName $ ChSubLibName (unUnqualComponentName' n) +#elif CH_MIN_VERSION_Cabal(2,0,0) componentNameToCh CLibName = ChLibName ChMainLibName -#if CH_MIN_VERSION_Cabal(2,0,0) componentNameToCh (CSubLibName n) = ChLibName $ ChSubLibName (unUnqualComponentName' n) +#else +componentNameToCh CLibName = ChLibName ChMainLibName +#endif +#if CH_MIN_VERSION_Cabal(2,0,0) componentNameToCh (CFLibName n) = ChFLibName (unUnqualComponentName' n) #endif componentNameToCh (CExeName n) = ChExeName (unUnqualComponentName' n) @@ -171,14 +184,18 @@ unUnqualComponentName' = id componentNameFromComponent :: Component -> ComponentName -#if !CH_MIN_VERSION_Cabal(1,25,0) --- CPP < 1.25 -componentNameFromComponent (CLib Library {}) = CLibName +#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 (CFLib ForeignLib {..}) = CFLibName foreignLibName #elif CH_MIN_VERSION_Cabal(1,25,0) -- CPP >= 1.25 (redundant) componentNameFromComponent (CLib Library { libName = Nothing }) = CLibName componentNameFromComponent (CLib Library { libName = Just n }) = CSubLibName n componentNameFromComponent (CFLib ForeignLib {..}) = CFLibName foreignLibName +#else +-- CPP < 1.25 +componentNameFromComponent (CLib Library {}) = CLibName #endif componentNameFromComponent (CExe Executable {..}) = CExeName exeName componentNameFromComponent (CTest TestSuite {..}) = CTestName testName |