picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Clean up *objdir variables.

Browse source
This commit is contained in:
Roland McGrath 2012-09-28 13:58:55 -07:00
parent b1c608fe20
commit cc87f7d851
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -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

5
Makeconfig
View file

@ -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)