Branch: Tag:

2005-09-01

2005-09-01 13:09:00 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Improved ABI detection.
Now uses --build in preference to --host when invoking configure for bundles.

Rev: src/configure.in:1.917

1: - AC_REVISION("$Id: configure.in,v 1.916 2005/08/31 14:01:11 grubba Exp $") + AC_REVISION("$Id: configure.in,v 1.917 2005/09/01 13:09:00 grubba Exp $")   AC_INIT(interpret.c)   AC_CONFIG_HEADER(machine.h)   
446:    pike_cv_default_compiler_abi=32    ;;    *) -  # Unknown. +  # Unknown. Probably cross-compiling.    PIKE_MSG_WARN([Unrecognized object file format: $filetype]) -  +  if dd if="conftest.$ac_cv_objext" count=2 bs=1 2>/dev/null | \ +  grep 'L' >/dev/null; then +  # A common case is rntcl... +  # If the file begins with 0x4c 0x01 it's a 80386 COFF executable. +  pike_cv_default_compiler_abi=32 +  fi    ;;    esac    fi
2020:    ])    ])    ], [ -  BUNDLE_FLAGS="$BUNDLE_FLAGS --host=x86_64" +  BUNDLE_FLAGS="$BUNDLE_FLAGS --build=x86_64"    ])    ;;    i86pc)
2036:    ])    ])    ], [ -  BUNDLE_FLAGS="$BUNDLE_FLAGS --host=x86_64" +  BUNDLE_FLAGS="$BUNDLE_FLAGS --build=x86_64"    ])   # AC_SYS_COMPILER_FLAG(-march=i686,march_i686,CFLAGS)    ;;
2451:    # MinGW system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.916 2005/08/31 14:01:11 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.917 2005/09/01 13:09:00 grubba Exp $.   # MinGW-version. Do NOT edit.   posix_name="`cat`"   posix_prefix="/"
2489:    # Native POSIX system.    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.916 2005/08/31 14:01:11 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.917 2005/09/01 13:09:00 grubba Exp $.   # POSIX-version. Do NOT edit.   cat   EOF
2498:    # rntcl-style    cat <<\EOF   #!/bin/sh - # Automatically generated by $Id: configure.in,v 1.916 2005/08/31 14:01:11 grubba Exp $. + # Automatically generated by $Id: configure.in,v 1.917 2005/09/01 13:09:00 grubba Exp $.   # RNTCL-version. Do NOT edit.   sed -e "$PIKE_PATH_TRANSLATE"   EOF
5220:    case "x$pike_cv_machine_code_arch" in    xia32)    # Force gmp to build for ia32 and not for x86_64. -  BUNDLE_FLAGS="$BUNDLE_FLAGS --host=i486" +  BUNDLE_FLAGS="$BUNDLE_FLAGS --build=i486"    ;;    esac    fi
7993:    # not likely to work with rntcl et al.    if echo foo "$CC" | egrep 'rntc.|rnt.cl' >/dev/null; then    cpu="`uname -m`" -  if test "$cpu" = "x86"; then +  case "$cpu-$with_abi" in +  *86-32|*amd*-32|*86_64-32)    # Normalize the cpu.    cpu="i386" -  fi +  ;; +  *86-64|*amd*-64|*86_64-64) +  cpu="x86_64" +  ;; +  esac    extra_configure_args="${extra_configure_args} --build=${cpu}-unknown-winnt`uname -r|sed -e 's/-/_/g'` --disable-assembler"    fi