From d7040446568306d0c74dd28683ab92ec25f42ccc Mon Sep 17 00:00:00 2001 From: Sylvain Henry Date: Fri, 24 Apr 2020 13:36:28 +0200 Subject: [PATCH] Support for -this-package-key deprecation -this-package-key command-line flag has been deprecated in GHC a long time ago (superseded by -this-unit-id). Cabal should support newer GHC releases without it. --- Cabal/Distribution/Backpack/Id.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cabal/Distribution/Backpack/Id.hs b/Cabal/Distribution/Backpack/Id.hs index 53b99784f3c..b0a010eebe2 100644 --- a/Cabal/Distribution/Backpack/Id.hs +++ b/Cabal/Distribution/Backpack/Id.hs @@ -125,8 +125,8 @@ computeCompatPackageKey -> UnitId -> String computeCompatPackageKey comp pkg_name pkg_version uid - | not (packageKeySupported comp) = - prettyShow pkg_name ++ "-" ++ prettyShow pkg_version + | not (packageKeySupported comp || unitIdSupported comp) + = prettyShow pkg_name ++ "-" ++ prettyShow pkg_version | not (unifiedIPIDRequired comp) = let str = unUnitId uid -- assume no Backpack support mb_verbatim_key