Commit 0025b51b authored by Mikhail Glushenkov's avatar Mikhail Glushenkov

filterConfigureFlags: fix the --enable-executable-static check.

parent 1f8eb303
......@@ -520,18 +520,20 @@ filterConfigureFlags flags cabalLibVersion
}
flags_2_5_0 = flags_latest {
-- Cabal < 2.5.0 does not understand --dependency=pkg:component=cid
-- Cabal < 2.5 does not understand --dependency=pkg:component=cid
-- (public sublibraries), so we convert it to the legacy
-- --dependency=pkg_or_internal_compoent=cid
configDependencies =
let convertToLegacyInternalDep (GivenComponent _ (LSubLibName cn) cid) =
Just $ GivenComponent
configDependencies =
let convertToLegacyInternalDep (GivenComponent _ (LSubLibName cn) cid) =
Just $ GivenComponent
(unqualComponentNameToPackageName cn)
LMainLibName
cid
convertToLegacyInternalDep (GivenComponent pn LMainLibName cid) =
Just $ GivenComponent pn LMainLibName cid
in catMaybes $ convertToLegacyInternalDep <$> configDependencies flags
convertToLegacyInternalDep (GivenComponent pn LMainLibName cid) =
Just $ GivenComponent pn LMainLibName cid
in catMaybes $ convertToLegacyInternalDep <$> configDependencies flags
-- Cabal < 2.5 doesn't know about '--enable/disable-executable-static'.
, configFullyStaticExe = NoFlag
}
flags_2_1_0 = flags_2_5_0 {
......@@ -560,7 +562,6 @@ filterConfigureFlags flags cabalLibVersion
-- Cabal < 1.23 doesn't know about '--profiling-detail'.
-- Cabal < 1.23 has a hacked up version of 'enable-profiling'
-- which we shouldn't use.
-- Cabal < 1.23 doesn't know about '--enable/disable-executable-static'.
(tryLibProfiling, tryExeProfiling) = computeEffectiveProfiling flags
flags_1_23_0 = flags_1_25_0 { configProfDetail = NoFlag
, configProfLibDetail = NoFlag
......@@ -568,7 +569,6 @@ filterConfigureFlags flags cabalLibVersion
, configProf = NoFlag
, configProfExe = Flag tryExeProfiling
, configProfLib = Flag tryLibProfiling
, configFullyStaticExe = NoFlag
}
-- Cabal < 1.22 doesn't know about '--disable-debug-info'.
......
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