From ec2261ba97cc523230aed37979d81092e4b11f14 Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Thu, 3 Nov 2005 21:23:07 +0000 Subject: Last bits for IMA, now everything can be built w/ DOMULTI=y on gcc-3.4.4 with my config (no locale, the rest enabled). Not tested if libc is complete and usable. All the files listed in *_NO_MULTI need love, best would be to replace all multisources w/ single sources. --- libc/misc/locale/Makefile.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libc/misc/locale/Makefile.in') diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in index 2cdd70609..5f363ac65 100644 --- a/libc/misc/locale/Makefile.in +++ b/libc/misc/locale/Makefile.in @@ -23,6 +23,8 @@ ifeq ($(UCLIBC_HAS_LOCALE),y) DATA:=locale_data.o endif +MISC_LOCALE_NO_MULTI=localeconv.o + MISC_LOCALE_DIR:=$(top_srcdir)libc/misc/locale MISC_LOCALE_OUT:=$(top_builddir)libc/misc/locale @@ -31,7 +33,7 @@ MISC_LOCALE_MOBJ:=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJ)) MISC_LOCALE_MOBJx=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MOBJx)) MISC_LOCALE_DATA=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(DATA)) -MISC_LOCALE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(notdir $(MISC_LOCALE_MOBJ)))) +MISC_LOCALE_DEF:=$(patsubst %,-DL_%,$(subst .o,,$(filter-out $(MISC_LOCALE_NO_MULTI),$(notdir $(MISC_LOCALE_MOBJ))))) $(MISC_LOCALE_MOBJ): $(MISC_LOCALE_MSRC) $(compile.m) @@ -60,6 +62,7 @@ libc-so-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx:.o=.os) CFLAGS-multi-y+=$(MISC_LOCALE_DEF) libc-multi-y+=$(MISC_LOCALE_MSRC) +libc-nomulti-y+=$(patsubst %.o,$(MISC_LOCALE_OUT)/%.o,$(MISC_LOCALE_NO_MULTI)) libc-nomulti-$(UCLIBC_HAS_LOCALE)+=$(MISC_LOCALE_DATA) libc-nomulti-$(UCLIBC_HAS_XLOCALE)+=$(MISC_LOCALE_MOBJx) -- cgit v1.2.3