diff options
| author | Roland McGrath <roland@gnu.org> | 2004-07-02 06:45:17 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-07-02 06:45:17 +0000 |
| commit | 9632aaee31bc5d21810e21c45bb1bb8af4897cc9 (patch) | |
| tree | dbe48c6faa4cce23046b1a980e02a21917ec3f3a /Makeconfig | |
| parent | ffbbbee18e9d3401e1916394428b31f2928b2926 (diff) | |
* aclocal.m4: Add provide for AC_CONFIG_AUX_DIR_DEFAULT.
* Makeconfig ($(common-objpfx)shlib-versions.v.i): Move top-level
$(..)shlib-versions file to last in deps list. This lets add-ons give
more-specific matches that override defaults in the top-level file.
* 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 'Makeconfig')
| -rw-r--r-- | Makeconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makeconfig b/Makeconfig index 5a9f068f11..92501a78c0 100644 --- a/Makeconfig +++ b/Makeconfig @@ -792,10 +792,11 @@ ifeq (yes, $(build-shared)) ifeq ($(sysd-sorted-done),t) -include $(common-objpfx)soversions.mk ifndef avoid-generated +# This lets add-ons give more-specific matches that override defaults +# in the top-level file. $(common-objpfx)shlib-versions.v.i: \ - $(..)shlib-versions $(wildcard $(patsubst %, $(..)%/shlib-versions,\ - $(add-ons) \ - $(subdirs))) + $(wildcard $(patsubst %, $(..)%/shlib-versions,$(add-ons) $(subdirs)))\ + $(..)shlib-versions $(common-objpfx)soversions.i: $(common-objpfx)shlib-versions.v default_setname='$(filter-out %_default,$(oldest-abi:%=GLIBC_%))'; \ while read conf version setname; do \ |