This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] Clean up *objdir variables.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: libc-alpha at sourceware dot org
- Date: Fri, 28 Sep 2012 14:00:45 -0700 (PDT)
- Subject: [COMMITTED PATCH] Clean up *objdir variables.
nssobjdir and resolvobjdir do not appear anywhere else in the source tree.
elfobjdir is used by ports/sysdeps/arm/Makefile unconditionally.
* Makeconfig (nssobjdir, resolvobjdir): Remove variables.
(elfobjdir): Move out of conditionals.
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)