aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2017-07-08 22:18:44 +0200
committerDaniel Gröber <dxld@darkboxed.org>2017-07-08 22:18:44 +0200
commitd03b93e993c7e9493226e7e8fe3b9ff833d06222 (patch)
tree153214e689da54359ef312ecdf29e4ddb6d4765a
parent7bd0fa34ba4194f7bf6c9668cb286d13fcc2b580 (diff)
Fix CH_MIN_VERSION_Cabal logic bug
-rw-r--r--CabalHelper/Compile.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/CabalHelper/Compile.hs b/CabalHelper/Compile.hs
index 2d0007d..b933a3b 100644
--- a/CabalHelper/Compile.hs
+++ b/CabalHelper/Compile.hs
@@ -175,7 +175,7 @@ compile distdir opts@Options {..} Compile {..} = do
, "-optP-DCH_MIN_VERSION_Cabal(major1,major2,minor)=(\
\ (major1) < "++show mj1++" \
\|| (major1) == "++show mj1++" && (major2) < "++show mj2++"\
- \|| (major1) == "++show mj1++" && (major2) == "++show mj2++" && (minor) < "++show mi++")"
+ \|| (major1) == "++show mj1++" && (major2) == "++show mj2++" && (minor) <= "++show mi++")"
],
maybeToList $ ("-package-conf="++) <$> compPackageDb,
map ("-i"++) $ nub $ ".":maybeToList cCabalSourceDir,