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 /libutil | |
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 'libutil')
-rw-r--r-- | libutil/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libutil/Makefile.in b/libutil/Makefile.in index a5abdfaba..b0182015c 100644 --- a/libutil/Makefile.in +++ b/libutil/Makefile.in @@ -35,8 +35,8 @@ libutil-a-y := $(libutil_OBJ) endif libutil-so-y := $(libutil_OBJ:.o=.os) -lib-a-y += $(top_builddir)lib/libutil.a -lib-so-y += $(top_builddir)lib/libutil.so +lib-a-$(UCLIBC_HAS_LIBUTIL) += $(top_builddir)lib/libutil.a +lib-so-$(UCLIBC_HAS_LIBUTIL) += $(top_builddir)lib/libutil.so objclean-y += libutil_clean ifeq ($(DOMULTI),n) |