Commit b7b98fc4 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Merge pull request #2482 from 23Skidoo/issue-2409-ugly-hack

Don't pass '--{en,dis}able-profiling' to old setup exes.
parents b3017e2f 393c8ba7
name: Cabal
version: 1.22.1.2
version: 1.22.2.0
copyright: 2003-2006, Isaac Jones
2005-2011, Duncan Coutts
license: BSD3
......
......@@ -458,7 +458,18 @@ configureOptions showOrParseArgs =
,option "" ["profiling"]
"Executable profiling (requires library profiling)"
configProfExe (\v flags -> flags { configProfLib = v, configProfExe = v })
-- HACK: See #2409. Thankfully, this is 1.22-specific.
(\flags ->
case (configProfLib flags, configProfExe flags) of
(Flag a, Flag b)
| (a == b)
&& ("cabalConfProf", "/TRUE") `elem` configProgramPaths flags
-> configProfExe flags
_ -> NoFlag)
(\v flags -> flags
{ configProfLib = v, configProfExe = v
, configProgramPaths = ("cabalConfProf", "/TRUE")
: configProgramPaths flags })
(boolOpt [] [])
,option "" ["executable-profiling"]
......
VERSION=1.22.1.2
VERSION=1.22.2.0
#KIND=devel
KIND=rc
......
......@@ -93,7 +93,7 @@ import Distribution.Simple.Utils
import Data.Char
( isSpace, isAlphaNum )
import Data.List
( intercalate, deleteFirstsBy )
( intercalate, delete, deleteFirstsBy )
import Data.Maybe
( listToMaybe, maybeToList, fromMaybe )
#if !MIN_VERSION_base(4,8,0)
......@@ -392,6 +392,9 @@ filterConfigureFlags flags cabalLibVersion
, configProfLib = configProfLib flags
, configCoverage = NoFlag
, configLibCoverage = configCoverage flags
-- HACK: See #2409.
, configProgramPaths =
("cabalConfProf", "/TRUE") `delete` configProgramPaths flags
}
-- Cabal < 1.19.2 doesn't know about '--exact-configuration'.
flags_1_19_1 = flags_1_20_0 { configExactConfiguration = NoFlag }
......
Name: cabal-install
Version: 1.22.0.1
Version: 1.22.2.0
Synopsis: The command-line interface for Cabal and Hackage.
Description:
The \'cabal\' command-line program simplifies the process of managing
......@@ -129,7 +129,7 @@ executable cabal
array >= 0.1 && < 0.6,
base >= 4.3 && < 5,
bytestring >= 0.9 && < 1,
Cabal >= 1.22 && < 1.23,
Cabal >= 1.22.2 && < 1.23,
containers >= 0.1 && < 0.6,
filepath >= 1.0 && < 1.5,
HTTP >= 4000.2.5 && < 4000.3,
......
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