aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-07-02 06:45:08 +0000
committerRoland McGrath <roland@gnu.org>2004-07-02 06:45:08 +0000
commitffbbbee18e9d3401e1916394428b31f2928b2926 (patch)
tree03f015c02b353efb65e5fd7af668895cf194131c /sysdeps/unix
parentf8ea3acb623f42f696b69c6de7b37c1e7cca719c (diff)
downloadglibc-ffbbbee18e9d3401e1916394428b31f2928b2926.tar
glibc-ffbbbee18e9d3401e1916394428b31f2928b2926.tar.gz
glibc-ffbbbee18e9d3401e1916394428b31f2928b2926.tar.bz2
glibc-ffbbbee18e9d3401e1916394428b31f2928b2926.zip
2004-07-01 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/configure.in: If arch_minimum_kernel was already set, don't set it or libc_cv_gcc_unwind_find_fde. * sysdeps/unix/sysv/linux/configure: Regenerated.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/configure6
-rw-r--r--sysdeps/unix/sysv/linux/configure.in6
2 files changed, 10 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index 7d7d2d1c7a..89484200ce 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -87,7 +87,11 @@ fi
# If the user gave a minimal version number test whether the available
# kernel headers are young enough. Additionally we have minimal
-# kernel versions for some architectures.
+# kernel versions for some architectures. If a previous configure fragment
+# set arch_minimum_kernel already, let that override our defaults here.
+# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
+# if appropriate too.
+test -n "$arch_minimum_kernel" ||
case "$machine" in
alpha*)
arch_minimum_kernel=2.1.100
diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in
index 818a59d2e4..f0a7fb1231 100644
--- a/sysdeps/unix/sysv/linux/configure.in
+++ b/sysdeps/unix/sysv/linux/configure.in
@@ -46,7 +46,11 @@ fi
# If the user gave a minimal version number test whether the available
# kernel headers are young enough. Additionally we have minimal
-# kernel versions for some architectures.
+# kernel versions for some architectures. If a previous configure fragment
+# set arch_minimum_kernel already, let that override our defaults here.
+# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
+# if appropriate too.
+test -n "$arch_minimum_kernel" ||
case "$machine" in
alpha*)
arch_minimum_kernel=2.1.100