patches/patch-configure.ac

   1 $NetBSD$
   2
   3 Hunk #0:
   4   Don't let *_STAGE0 to be empty even when we're bootstrapping from
   5   HC.
   6
   7 Hunk #1:
   8   Use of the notorious '==' operator of test(1).
   9
  10
  11 --- configure.ac.orig   2012-02-01 18:10:32.000000000 +0000
  12 +++ configure.ac
  13 @@ -117,7 +117,12 @@ AC_ARG_ENABLE(bootstrap-with-devel-snaps
  14          EnableBootstrapWithDevelSnaphost=NO
  15  )
  16
  17 -if test "$WithGhc" != ""; then
  18 +if test "$WithGhc" = ""; then
  19 +  CC_STAGE0='$(CC)'
  20 +  AR_STAGE0='$(AR)'
  21 +  AR_OPTS_STAGE0='$(AR_OPTS)'
  22 +  ArSupportsAtFile_STAGE0='$(ArSupportsAtFile)'
  23 +else
  24    FPTOOLS_GHC_VERSION([GhcVersion], [GhcMajVersion], [GhcMinVersion], [GhcPatchLevel])dnl
  25
  26    if test "$GhcMajVersion" = "unknown" -o "$GhcMinVersion" = "unknown"; then
  27 @@ -496,7 +501,7 @@ dnl ** check for dtrace (currently only
  28  HaveDtrace=NO
  29  AC_PATH_PROG(DtraceCmd,dtrace)
  30  if test -n "$DtraceCmd"; then
  31 -  if test "x$TargetOS_CPP-$TargetVendor_CPP" == "xdarwin-apple" -o "x$TargetOS_CPP-$TargetVendor_CPP" == "xsolaris2-unknown"; then
  32 +  if test "x$TargetOS_CPP-$TargetVendor_CPP" = "xdarwin-apple" -o "x$TargetOS_CPP-$TargetVendor_CPP" = "xsolaris2-unknown"; then
  33      HaveDtrace=YES
  34    fi
  35  fi