diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-09-28 14:33:40 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-09-28 14:33:40 -0700 |
| commit | 6bacf05bfde0816659d6d7f73c063571633b8f6a (patch) | |
| tree | 545abe7d80b17152a68647a3bb590f1acfbbe506 | |
| parent | 91363dbbb9e4fe96c9f3ec465852c5e04fd4f68e (diff) | |
| download | glibc-6bacf05bfde0816659d6d7f73c063571633b8f6a.tar.gz glibc-6bacf05bfde0816659d6d7f73c063571633b8f6a.tar.xz glibc-6bacf05bfde0816659d6d7f73c063571633b8f6a.zip | |
Quiet make warning under --disable-shared.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | nss/Makefile | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index ab2620768e..d3e6acfd9d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-09-28 Roland McGrath <roland@hack.frob.com> + * nss/Makefile ($(objpfx)/libnss_test1.so$(libnss_test1.so-version)): + Conditionalize target on [libnss_test1.so-version]. + * elf/dl-sysdep.c: Conditionalize whole contents on [SHARED]. * Makeconfig (nssobjdir, resolvobjdir): Remove variables. diff --git a/nss/Makefile b/nss/Makefile index a272ebe13d..eecf57e205 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -111,6 +111,8 @@ CFLAGS-nss_test1.c = -DNOT_IN_libc=1 $(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(common-objpfx)libc.so \ $(common-objpfx)libc_nonshared.a $(build-module) +ifdef libnss_test1.so-version $(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so $(make-link) +endif $(objpfx)tst-nss-test1.out: $(objpfx)/libnss_test1.so$(libnss_test1.so-version) |