aboutsummaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-07-31 07:21:56 +0000
committerUlrich Drepper <drepper@redhat.com>1999-07-31 07:21:56 +0000
commitf01010de9b930aed92bac4f9d5236bd0a2ec6a87 (patch)
tree9ff42245d52c91050a302920e218ea9630f3887a /Makeconfig
parent899a282782e09ff205d7fce117d0fec5a3277e15 (diff)
downloadglibc-f01010de9b930aed92bac4f9d5236bd0a2ec6a87.tar
glibc-f01010de9b930aed92bac4f9d5236bd0a2ec6a87.tar.gz
glibc-f01010de9b930aed92bac4f9d5236bd0a2ec6a87.tar.bz2
glibc-f01010de9b930aed92bac4f9d5236bd0a2ec6a87.zip
Update.
* Makeconfig (link-libc): Always define it, not only for shared builds.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig15
1 files changed, 8 insertions, 7 deletions
diff --git a/Makeconfig b/Makeconfig
index e1e53605ab..fb11c28691 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -407,13 +407,6 @@ ifeq (yes,$(build-shared))
link-libc = -Wl,-rpath-link=$(rpath-link) \
$(common-objpfx)libc.so$(libc.so-version) \
$(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
-# Choose the default search path for the dynamic linker based on
-# where we will install libraries.
-ifneq ($(libdir),$(slibdir))
-default-rpath = $(slibdir):$(libdir)
-else
-default-rpath = $(libdir)
-endif
# This is how to find at build-time things that will be installed there.
rpath-dirs = math elf dlfcn nss nis db2 rt resolv
rpath-link = \
@@ -427,6 +420,14 @@ link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) $(common-objpfx)libc.a
endif
endif
+# Choose the default search path for the dynamic linker based on
+# where we will install libraries.
+ifneq ($(libdir),$(slibdir))
+default-rpath = $(slibdir):$(libdir)
+else
+default-rpath = $(libdir)
+endif
+
ifndef link-extra-libs
ifeq (yes,$(build-shared))
ifneq ($(common-objpfx),$(objpfx))