Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • changelog.d/T27317
    1
    +section: packaging
    
    2
    +synopsis: Enforce cabal-install >= 3.12 requirement upfront when building Hadrian
    
    3
    +issues: #27317
    
    4
    +mrs: !16132
    
    5
    +description:
    
    6
    +  We now enforce the cabal-install >= 3.12 requirement upfront when building
    
    7
    +  Hadrian, instead of silently accepting older versions and later failing.

  • hadrian/build-cabal
    ... ... @@ -23,8 +23,10 @@ fi
    23 23
     CABVERSTR=$("$CABAL" --numeric-version)
    
    24 24
     CABVER=( ${CABVERSTR//./ } )
    
    25 25
     
    
    26
    -if [ "${CABVER[0]}" -lt 3 ]; then
    
    27
    -    echo "Cabal version is too old; you need at least cabal-install 3.0"
    
    26
    +# We use 'cabal path', introduced with cabal-install 3.12.
    
    27
    +# Check version ahead of time to avoid a surprising failure later (#27317).
    
    28
    +if [ "${CABVER[0]}" -lt 3 ] || { [ "${CABVER[0]}" -eq 3 ] && [ "${CABVER[1]}" -lt 12 ]; }; then
    
    29
    +    echo "Cabal version is too old; you need at least cabal-install 3.12"
    
    28 30
         exit 2
    
    29 31
     fi
    
    30 32