diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-04-02 09:17:30 -0700 |
| commit | aae3eb9256affb18cff589b52ee26e0a4e557bbd (patch) | |
| tree | 003711a54e7dfbde0b50979e2942fd3e0d3451c8 /libm | |
| parent | ef18cfe8ebab25f5ef92e81956f50e2dc57df602 (diff) | |
| parent | 2864786ad884369ab5397be864e9f43d32bc2726 (diff) | |
Merge commit 'origin/master' into nptl
Conflicts:
Makefile.in
extra/Configs/Config.in
libc/sysdeps/linux/common/bits/kernel-features.h
libc/sysdeps/linux/common/poll.c
libc/sysdeps/linux/common/sysdep.h
libc/sysdeps/linux/sh/sysdep.h
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libm')
| -rw-r--r-- | libm/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libm/Makefile.in b/libm/Makefile.in index 6eb935851..6cf0925fe 100644 --- a/libm/Makefile.in +++ b/libm/Makefile.in @@ -270,7 +270,7 @@ libm-so-y += $(libm_OBJS:.o=.os) lib-a-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.a lib-so-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.so -objclean-y += libm_clean +objclean-y += CLEAN_libm ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) @@ -316,5 +316,5 @@ $(libm_MOBJ_FL:.o=.i): $(libm_MSRC_FL) $(libm_MOBJ_LD:.o=.i): $(libm_MSRC_LD) $(compile.mi) -libm_clean: +CLEAN_libm: $(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*.,$(d)$(e)))) |