Commit 6b64493e authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺

Fix logic error in Setup.hs filterConfigureFlags

This typo inadvertently sneaked in via
bf89715d

This was causing CI to fail whenever Cabal 2.4 was picked
for custom setups.
parent 6df109d3
......@@ -490,7 +490,7 @@ filterConfigureFlags :: ConfigFlags -> Version -> ConfigFlags
filterConfigureFlags flags cabalLibVersion
-- NB: we expect the latest version to be the most common case,
-- so test it first.
| cabalLibVersion >= mkVersion [2,3,0] = flags_latest
| cabalLibVersion >= mkVersion [2,5,0] = flags_latest
-- The naming convention is that flags_version gives flags with
-- all flags *introduced* in version eliminated.
-- It is NOT the latest version of Cabal library that
......@@ -509,7 +509,7 @@ filterConfigureFlags flags cabalLibVersion
| cabalLibVersion < mkVersion [1,25,0] = flags_1_25_0
| cabalLibVersion < mkVersion [2,1,0] = flags_2_1_0
| cabalLibVersion < mkVersion [2,5,0] = flags_2_5_0
| otherwise = flags_latest
| otherwise = error "the impossible just happened" -- see first guard
where
flags_latest = flags {
-- Cabal >= 1.19.1 uses '--dependency' and does not need '--constraint'.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment