mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 04:50:07 +00:00
Move AC_CANONICAL_HOST before first use of $host and $build.
This commit is contained in:
Andreas Schwab
Roland McGrath
parent
cc3ae2461c
commit
c16a054d5e
@ -1,3 +1,9 @@
|
|||||||
|
2009-05-30 Andreas Schwab <schwab@linux-m68k.org>
|
||||||
|
|
||||||
|
* configure.in: Move AC_CANONICAL_HOST before first use of $host
|
||||||
|
and $build.
|
||||||
|
* configure: Regenerated.
|
||||||
|
|
||||||
2009-05-29 Jakub Jelinek <jakub@redhat.com>
|
2009-05-29 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
* sysdeps/ieee754/ldbl-128/s_expm1l.c: Include <errno.h>.
|
* sysdeps/ieee754/ldbl-128/s_expm1l.c: Include <errno.h>.
|
||||||
|
|||||||
184
configure
vendored
184
configure
vendored
@ -726,14 +726,6 @@ base_machine
|
|||||||
add_on_subdirs
|
add_on_subdirs
|
||||||
add_ons
|
add_ons
|
||||||
subdirs
|
subdirs
|
||||||
host_os
|
|
||||||
host_vendor
|
|
||||||
host_cpu
|
|
||||||
host
|
|
||||||
build_os
|
|
||||||
build_vendor
|
|
||||||
build_cpu
|
|
||||||
build
|
|
||||||
libc_cv_nss_crypt
|
libc_cv_nss_crypt
|
||||||
experimental_malloc
|
experimental_malloc
|
||||||
multi_arch
|
multi_arch
|
||||||
@ -756,6 +748,14 @@ CPPFLAGS
|
|||||||
LDFLAGS
|
LDFLAGS
|
||||||
CFLAGS
|
CFLAGS
|
||||||
CC
|
CC
|
||||||
|
host_os
|
||||||
|
host_vendor
|
||||||
|
host_cpu
|
||||||
|
host
|
||||||
|
build_os
|
||||||
|
build_vendor
|
||||||
|
build_cpu
|
||||||
|
build
|
||||||
target_alias
|
target_alias
|
||||||
host_alias
|
host_alias
|
||||||
build_alias
|
build_alias
|
||||||
@ -2011,6 +2011,90 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Make sure we can run config.sub.
|
||||||
|
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
||||||
|
{ { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
||||||
|
$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:$LINENO: checking build system type" >&5
|
||||||
|
$as_echo_n "checking build system type... " >&6; }
|
||||||
|
if test "${ac_cv_build+set}" = set; then
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_build_alias=$build_alias
|
||||||
|
test "x$ac_build_alias" = x &&
|
||||||
|
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
||||||
|
test "x$ac_build_alias" = x &&
|
||||||
|
{ { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
||||||
|
$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
||||||
|
{ { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
||||||
|
$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
||||||
|
$as_echo "$ac_cv_build" >&6; }
|
||||||
|
case $ac_cv_build in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
||||||
|
$as_echo "$as_me: error: invalid value of canonical build" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; };;
|
||||||
|
esac
|
||||||
|
build=$ac_cv_build
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_build
|
||||||
|
shift
|
||||||
|
build_cpu=$1
|
||||||
|
build_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
build_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:$LINENO: checking host system type" >&5
|
||||||
|
$as_echo_n "checking host system type... " >&6; }
|
||||||
|
if test "${ac_cv_host+set}" = set; then
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
if test "x$host_alias" = x; then
|
||||||
|
ac_cv_host=$ac_cv_build
|
||||||
|
else
|
||||||
|
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
||||||
|
{ { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
||||||
|
$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
||||||
|
$as_echo "$ac_cv_host" >&6; }
|
||||||
|
case $ac_cv_host in
|
||||||
|
*-*-*) ;;
|
||||||
|
*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
||||||
|
$as_echo "$as_me: error: invalid value of canonical host" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; };;
|
||||||
|
esac
|
||||||
|
host=$ac_cv_host
|
||||||
|
ac_save_IFS=$IFS; IFS='-'
|
||||||
|
set x $ac_cv_host
|
||||||
|
shift
|
||||||
|
host_cpu=$1
|
||||||
|
host_vendor=$2
|
||||||
|
shift; shift
|
||||||
|
# Remember, the first character of IFS is used to create $*,
|
||||||
|
# except with old shells:
|
||||||
|
host_os=$*
|
||||||
|
IFS=$ac_save_IFS
|
||||||
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_ext=c
|
ac_ext=c
|
||||||
ac_cpp='$CPP $CPPFLAGS'
|
ac_cpp='$CPP $CPPFLAGS'
|
||||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||||
@ -3844,90 +3928,6 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Make sure we can run config.sub.
|
|
||||||
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
|
|
||||||
{ { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
|
|
||||||
$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:$LINENO: checking build system type" >&5
|
|
||||||
$as_echo_n "checking build system type... " >&6; }
|
|
||||||
if test "${ac_cv_build+set}" = set; then
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
ac_build_alias=$build_alias
|
|
||||||
test "x$ac_build_alias" = x &&
|
|
||||||
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
|
|
||||||
test "x$ac_build_alias" = x &&
|
|
||||||
{ { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
|
|
||||||
$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
|
|
||||||
{ { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
|
|
||||||
$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
|
|
||||||
$as_echo "$ac_cv_build" >&6; }
|
|
||||||
case $ac_cv_build in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
|
|
||||||
$as_echo "$as_me: error: invalid value of canonical build" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; };;
|
|
||||||
esac
|
|
||||||
build=$ac_cv_build
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_build
|
|
||||||
shift
|
|
||||||
build_cpu=$1
|
|
||||||
build_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
build_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
{ $as_echo "$as_me:$LINENO: checking host system type" >&5
|
|
||||||
$as_echo_n "checking host system type... " >&6; }
|
|
||||||
if test "${ac_cv_host+set}" = set; then
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
if test "x$host_alias" = x; then
|
|
||||||
ac_cv_host=$ac_cv_build
|
|
||||||
else
|
|
||||||
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
|
|
||||||
{ { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
|
|
||||||
$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
|
|
||||||
$as_echo "$ac_cv_host" >&6; }
|
|
||||||
case $ac_cv_host in
|
|
||||||
*-*-*) ;;
|
|
||||||
*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
|
|
||||||
$as_echo "$as_me: error: invalid value of canonical host" >&2;}
|
|
||||||
{ (exit 1); exit 1; }; };;
|
|
||||||
esac
|
|
||||||
host=$ac_cv_host
|
|
||||||
ac_save_IFS=$IFS; IFS='-'
|
|
||||||
set x $ac_cv_host
|
|
||||||
shift
|
|
||||||
host_cpu=$1
|
|
||||||
host_vendor=$2
|
|
||||||
shift; shift
|
|
||||||
# Remember, the first character of IFS is used to create $*,
|
|
||||||
# except with old shells:
|
|
||||||
host_os=$*
|
|
||||||
IFS=$ac_save_IFS
|
|
||||||
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# The way shlib-versions is used to generate soversions.mk uses a
|
# The way shlib-versions is used to generate soversions.mk uses a
|
||||||
# fairly simplistic model for name recognition that can't distinguish
|
# fairly simplistic model for name recognition that can't distinguish
|
||||||
# i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os
|
# i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os
|
||||||
|
|||||||
@ -6,6 +6,8 @@ AC_CONFIG_SRCDIR([include/features.h])
|
|||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
AC_CONFIG_AUX_DIR([scripts])
|
AC_CONFIG_AUX_DIR([scripts])
|
||||||
|
|
||||||
|
AC_CANONICAL_HOST
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
if test $host != $build; then
|
if test $host != $build; then
|
||||||
AC_CHECK_PROGS(BUILD_CC, gcc cc)
|
AC_CHECK_PROGS(BUILD_CC, gcc cc)
|
||||||
@ -316,8 +318,6 @@ else
|
|||||||
fi
|
fi
|
||||||
AC_SUBST(libc_cv_nss_crypt)
|
AC_SUBST(libc_cv_nss_crypt)
|
||||||
|
|
||||||
AC_CANONICAL_HOST
|
|
||||||
|
|
||||||
# The way shlib-versions is used to generate soversions.mk uses a
|
# The way shlib-versions is used to generate soversions.mk uses a
|
||||||
# fairly simplistic model for name recognition that can't distinguish
|
# fairly simplistic model for name recognition that can't distinguish
|
||||||
# i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os
|
# i486-pc-linux-gnu fully from i486-pc-gnu. So we mutate a $host_os
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user