diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:46:31 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-22 11:51:37 -0800 |
| commit | f757db2d319ccc5f7034165046fb2bb58901afb1 (patch) | |
| tree | 7dc465febb3a802d3f0e8856fcda856b13b04c0a /libresolv | |
| parent | 76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff) | |
| parent | b71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff) | |
Merge remote branch 'origin/master' into nptl_merge
Conflicts:
Rules.mak
libc/misc/sysvipc/msgq.c
test/Rules.mak
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libresolv')
| -rw-r--r-- | libresolv/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in index efd0d9297..c859c4c7a 100644 --- a/libresolv/Makefile.in +++ b/libresolv/Makefile.in @@ -28,8 +28,8 @@ libresolv-a-y := $(libresolv_OBJ) endif libresolv-so-y := $(libresolv_OBJ:.o=.os) -lib-a-$(UCLIBC_HAS_RESOLV_STUB) += $(top_builddir)lib/libresolv.a -lib-so-$(UCLIBC_HAS_RESOLV_STUB) += $(top_builddir)lib/libresolv.so +lib-a-$(UCLIBC_HAS_LIBRESOLV_STUB) += $(top_builddir)lib/libresolv.a +lib-so-$(UCLIBC_HAS_LIBRESOLV_STUB) += $(top_builddir)lib/libresolv.so objclean-y += libresolv_clean ifeq ($(DOPIC),y) |