aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-09-28 13:58:55 -0700
committerRoland McGrath <roland@hack.frob.com>2012-09-28 13:58:55 -0700
commitcc87f7d8511e6ca777211abea0bf979138c4c60d (patch)
treea0095a00417ad49b536c1bc7ce9f6ea9b9597327
parentb1c608fe20672fe645cd171e89195b4a00914db1 (diff)
downloadglibc-cc87f7d8511e6ca777211abea0bf979138c4c60d.zip
glibc-cc87f7d8511e6ca777211abea0bf979138c4c60d.tar.gz
glibc-cc87f7d8511e6ca777211abea0bf979138c4c60d.tar.bz2
Clean up *objdir variables.
-rw-r--r--ChangeLog3
-rw-r--r--Makeconfig5
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fcf34d..7108c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-09-28 Roland McGrath <roland@hack.frob.com>
+ * Makeconfig (nssobjdir, resolvobjdir): Remove variables.
+ (elfobjdir): Move out of conditionals.
+
* nss/nsswitch.c (nss_new_service): Conditionalize definition and
declaration on [!DO_STATIC_NSS || SHARED], matching its only caller.
(__nss_lookup_function): Conditionalize label remove_from_tree on
diff --git a/Makeconfig b/Makeconfig
index e96ebc7..6a54bf3 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -494,15 +494,14 @@ link-libc-tests = $(link-libc-before-gnulib) $(gnulib-tests)
rpath-dirs = math elf dlfcn nss nis rt resolv crypt
rpath-link = \
$(common-objdir):$(subst $(empty) ,:,$(patsubst ../$(subdir),.,$(rpath-dirs:%=$(common-objpfx)%)))
-elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
else
-nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
-resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) $(common-objpfx)libc.a $(gnulib)
link-libc-tests = $(common-objpfx)libc.a $(otherlibs) $(gnulib-tests) $(common-objpfx)libc.a $(gnulib-tests)
endif
endif
+elfobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)elf)
+
# Differences in the linkers on the various platforms.
LDFLAGS-rpath-ORIGIN = -Wl,-rpath,'$$ORIGIN'
LDFLAGS-soname-fname = -Wl,-soname,$(@F)