about summary refs log tree commit diff
path: root/Makeconfig
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 /Makeconfig
parentb1c608fe20672fe645cd171e89195b4a00914db1 (diff)
downloadglibc-cc87f7d8511e6ca777211abea0bf979138c4c60d.tar.gz
glibc-cc87f7d8511e6ca777211abea0bf979138c4c60d.tar.xz
glibc-cc87f7d8511e6ca777211abea0bf979138c4c60d.zip
Clean up *objdir variables.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/Makeconfig b/Makeconfig
index e96ebc7e96..6a54bf32f6 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)