From 0b7de90484163ee3d15fa52831ee2944d79cc5e0 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Mon, 27 May 2019 15:05:20 +0200 Subject: Revert compilerVersion being project-scope Turns out the Setup header has the compiler version used to build Setup, not the version the project is configured to use. --- src/CabalHelper/Compiletime/Types.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/CabalHelper') diff --git a/src/CabalHelper/Compiletime/Types.hs b/src/CabalHelper/Compiletime/Types.hs index 653497d..ec24f2d 100644 --- a/src/CabalHelper/Compiletime/Types.hs +++ b/src/CabalHelper/Compiletime/Types.hs @@ -246,12 +246,14 @@ data UnitHeader = UnitHeader { uhBrokenPackageId :: !(ByteString, Version) -- ^ Name and version of the source package. Don't use this, it's broken -- when the package name contains Unicode characters. See 'uiPackageId' - -- instead. + -- instead. Note: This was fixed by hvr in Cabal HEAD actually. , uhSetupId :: !(ByteString, Version) -- ^ Name and version of the @Setup.hs@ implementation. We expect -- @"Cabal"@ here, naturally. , uhCompilerId :: !(ByteString, Version) - -- ^ Name and version of the compiler this Unit is configured to use. + -- ^ Name and version of the compiler that was used to build + -- Setup.hs. WARNING: This does not identify the GHC version the project + -- is configured to use! } deriving (Eq, Ord, Read, Show) newtype UnitId = UnitId String -- cgit v1.2.3