Wolfgang Jeltsch pushed to branch wip/jeltsch/ghc-9-14-building-base at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • .gitlab/base-ci.sh
    ... ... @@ -31,34 +31,31 @@ mkdir other-ghcs/opt
    31 31
     project_root=$PWD
    
    32 32
     
    
    33 33
     # Create Cabal file for `base`
    
    34
    -(
    
    35
    -  cd libraries/base
    
    36
    -  sed -E -e 's/^( *ghc-internal)[^[:alnum:]-].*(,|$)/\1\2/' \
    
    37
    -    < base.cabal.in \
    
    38
    -    > base.cabal
    
    39
    -)
    
    34
    +cd libraries/base
    
    35
    +sed -E -e 's/^( *ghc-internal)[^[:alnum:]-].*(,|$)/\1\2/' \
    
    36
    +  < base.cabal.in \
    
    37
    +  > base.cabal
    
    38
    +cd ${project_root}
    
    40 39
     
    
    41 40
     # Build `base` with the different GHCs
    
    42 41
     for ghc_version in ${ghc_versions}
    
    43 42
     do
    
    44 43
       # Install the GHC
    
    45
    -  (
    
    46
    -    cd other-ghcs/src
    
    47
    -    archive_file=ghc-${ghc_version}-${platform}.tar.xz
    
    48
    -    curl https://downloads.haskell.org/~ghc/${ghc_version}/${archive_file} \
    
    49
    -      >${ghc_version}.tar.xz
    
    50
    -    tar -xJf ${ghc_version}.tar.xz
    
    51
    -    cd ghc-${ghc_version}-*
    
    52
    -    ./configure --prefix "${project_root}/opt/${ghc_version}"
    
    53
    -    make install
    
    54
    -  )
    
    44
    +  cd other-ghcs/src
    
    45
    +  archive_file=ghc-${ghc_version}-${platform}.tar.xz
    
    46
    +  curl https://downloads.haskell.org/~ghc/${ghc_version}/${archive_file} \
    
    47
    +    >${ghc_version}.tar.xz
    
    48
    +  tar -xJf ${ghc_version}.tar.xz
    
    49
    +  cd ghc-${ghc_version}-*
    
    50
    +  ./configure --prefix "${project_root}/opt/${ghc_version}"
    
    51
    +  make install
    
    52
    +  cd ${project_root}
    
    55 53
     
    
    56 54
       # Build `base` with the installed GHC
    
    57
    -  (
    
    58
    -    cd libraries/base
    
    59
    -    cabal build
    
    60
    -      --with-compiler "${project_root}/other-ghcs/opt/${ghc_version}/bin/ghc" \
    
    61
    -      --allow-boot-library-installs \
    
    62
    -      -O0
    
    63
    -  )
    
    55
    +  cd libraries/base
    
    56
    +  cabal build
    
    57
    +    --with-compiler "${project_root}/other-ghcs/opt/${ghc_version}/bin/ghc" \
    
    58
    +    --allow-boot-library-installs \
    
    59
    +    -O0
    
    60
    +  cd ${project_root}
    
    64 61
     done