aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-01-18 01:21:47 +0000
committerRoland McGrath <roland@gnu.org>2005-01-18 01:21:47 +0000
commit1d038b6bb27e421c593e79f860f1a41c7d1c7a5d (patch)
treec578444250435b611e08d60b6acdaa4aeec6444a
parent24e860324f7b3927d9d49c631a50cbf97d0a9230 (diff)
downloadglibc-1d038b6bb27e421c593e79f860f1a41c7d1c7a5d.zip
glibc-1d038b6bb27e421c593e79f860f1a41c7d1c7a5d.tar.gz
glibc-1d038b6bb27e421c593e79f860f1a41c7d1c7a5d.tar.bz2
* nscd/Makefile (LDLIBS-nscd): New variable.
($(objpfx)nscd): Use that instead of selinux-LIBS. * Makeconfig (link-extra-libs): Define just as $(LDLIBS-$(@F)). (link-extra-libs-static): Define to $(link-extra-libs). (link-extra-libs-bounded): Likewise.
-rw-r--r--ChangeLog9
-rw-r--r--Makeconfig19
2 files changed, 13 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index eb32548..3735a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-17 Roland McGrath <roland@redhat.com>
+
+ * nscd/Makefile (LDLIBS-nscd): New variable.
+ ($(objpfx)nscd): Use that instead of selinux-LIBS.
+
+ * Makeconfig (link-extra-libs): Define just as $(LDLIBS-$(@F)).
+ (link-extra-libs-static): Define to $(link-extra-libs).
+ (link-extra-libs-bounded): Likewise.
+
2005-01-17 Ulrich Drepper <drepper@redhat.com>
* include/link.h: Remove stray definition of pltenter.
diff --git a/Makeconfig b/Makeconfig
index d267e5a..5ecda01 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1991-2003, 2004, 2005 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -480,32 +480,21 @@ default-rpath = $(libdir)
endif
ifndef link-extra-libs
-ifeq (yes,$(build-shared))
-ifneq ($(common-objpfx),$(objpfx))
-link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),\
- $(wildcard $(common-objpfx)$(lib).so$($(notdir $(lib)).so-version) \
- $(objpfx)$(lib).so$($(notdir $(lib)).so-version)))
-else
-link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).so$($(notdir $(lib)).so-version))
-endif
-else
-link-extra-libs = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).a)
-endif
+link-extra-libs = $(LDLIBS-$(@F))
+link-extra-libs-static = $(link-extra-libs)
+link-extra-libs-bounded = $(link-extra-libs)
endif
# The static libraries.
ifeq (yes,$(build-static))
link-libc-static = $(common-objpfx)libc.a $(static-gnulib) $(common-objpfx)libc.a
-link-extra-libs-static = $(foreach lib,$(LDLIBS-$(@F)),$(common-objpfx)$(lib).a)
else
ifeq (yes,$(build-shared))
# We can try to link the programs with lib*_pic.a...
link-libc-static = $(static-gnulib) $(common-objpfx)libc_pic.a
-link-extra-libs-static = $(link-extra-libs)
endif
endif
link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a
-link-extra-libs-bounded = $(foreach lib,$(LDLIBS-$(@F:%-bp=%)),$(common-objpfx)$(lib)_b.a)
ifndef gnulib
ifneq ($(have-cc-with-libunwind),yes)