patches/patch-configure

   1 $NetBSD$
   2
   3 HC bootstrapping has bitrotted further. The original ./configure tries
   4 to use stage-0 GHC even when --enable-hc-boot is given.
   5
   6
   7 --- configure.orig      2011-03-26 18:10:47.000000000 +0000
   8 +++ configure
   9 @@ -3626,6 +3626,8 @@ checkArch "$TargetArch"
  10  checkVendor "$TargetVendor"
  11  checkOS "$TargetOS"
  12
  13 +if test "${WithGhc}" != ""
  14 +then
  15  # Verify that the installed (bootstrap) GHC is capable of generating
  16  # code for the requested build platform.
  17  if test "$build" != "$bootstrap_target"
  18 @@ -3635,7 +3637,7 @@ then
  19      echo "   Desired build platform : $BuildPlatform"
  20      exit 1
  21  fi
  22 -
  23 +fi
  24
  25
  26
  27 @@ -3757,6 +3759,8 @@ fi
  28
  29  # This uses GHC, so put it after the "GHC is required" check above:
  30
  31 +if ! test -x "utils/ghc-pwd/dist-boot/ghc-pwd"
  32 +then
  33  { $as_echo "$as_me:${as_lineno-$LINENO}: Building in-tree ghc-pwd" >&5
  34  $as_echo "$as_me: Building in-tree ghc-pwd" >&6;}
  35                  rm -rf utils/ghc-pwd/dist-boot
  36 @@ -3765,6 +3769,7 @@ $as_echo "$as_me: Building in-tree ghc-p
  37      then
  38          as_fn_error "Building ghc-pwd failed" "$LINENO" 5
  39      fi
  40 +fi
  41
  42      GHC_PWD=utils/ghc-pwd/dist-boot/ghc-pwd
  43
  44 @@ -6255,7 +6260,7 @@ fi
  45
  46
  47  if test -n "$DtraceCmd"; then
  48 -  if test "x$TargetOS_CPP-$TargetVendor_CPP" == "xdarwin-apple" -o "x$TargetOS_CPP-$TargetVendor_CPP" == "xsolaris2-unknown"; then
  49 +  if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple" -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xsolaris2-unknown"; then
  50      HaveDtrace=YES
  51    fi
  52  fi
  53 @@ -6581,6 +6586,7 @@ $as_echo "$as_me: WARNING: cannot find h
  54  fi
  55
  56
  57 +if test "$BootingFromHc" = "NO"; then
  58  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ghc-pkg matching $WithGhc" >&5
  59  $as_echo_n "checking for ghc-pkg matching $WithGhc... " >&6; }
  60  if test "${fp_cv_matching_ghc_pkg+set}" = set; then :
  61 @@ -6602,6 +6608,7 @@ fi
  62  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fp_cv_matching_ghc_pkg" >&5
  63  $as_echo "$fp_cv_matching_ghc_pkg" >&6; }
  64  GhcPkgCmd=$fp_cv_matching_ghc_pkg
  65 +fi
  66
  67
  68