Sven Tennie pushed to branch wip/supersven/correctly_propagate_host-build-target at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • .gitlab/ci.sh
    ... ... @@ -628,20 +628,6 @@ function install_bindist() {
    628 628
         *)
    
    629 629
           read -r -a args <<< "${INSTALL_CONFIGURE_ARGS:-}"
    
    630 630
     
    
    631
    -      if [[ "${CROSS_TARGET:-no_cross_target}" =~ "mingw" ]]; then
    
    632
    -          # We suppose that host target = build target.
    
    633
    -          # By the fact above it is clearly turning out which host value is
    
    634
    -          # for currently built compiler.
    
    635
    -          # The fix for #21970 will probably remove this if-branch.
    
    636
    -          local -r CROSS_HOST_GUESS=$($SHELL ./config.guess)
    
    637
    -          args+=( "--target=$CROSS_TARGET" "--host=$CROSS_HOST_GUESS" )
    
    638
    -
    
    639
    -      # FIXME: The bindist configure script shouldn't need to be reminded of
    
    640
    -      # the target platform. See #21970.
    
    641
    -      elif [ -n "${CROSS_TARGET:-}" ]; then
    
    642
    -          args+=( "--target=$CROSS_TARGET" "--host=$CROSS_TARGET" )
    
    643
    -      fi
    
    644
    -
    
    645 631
           run ${CONFIGURE_WRAPPER:-} ./configure \
    
    646 632
               --prefix="$instdir" \
    
    647 633
               "${args[@]+"${args[@]}"}" || fail "bindist configure failed"