diff options
| -rw-r--r-- | libc/string/Makefile.in | 2 | ||||
| -rw-r--r-- | libc/string/generic/Makefile.in | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in index 6b0a154ca..256d21a9f 100644 --- a/libc/string/Makefile.in +++ b/libc/string/Makefile.in @@ -94,7 +94,7 @@ $(STRING_MOBJWx:.o=.os): $(STRING_MSRC) libc-a-y+=$(STRING_OBJS) libc-so-y+=$(STRING_OBJS:.o=.os) -# multi does not work here, because arch/Makefile.in uses the same L_* defines +# multi does not work here, because arch/Makefile.arch uses the same L_* defines #CFLAGS-multi-y+=$(STRING_DEF) #libc-multi-y+=$(STRING_MSRC) #libc-nomulti-y+=$(STRING_Wx) diff --git a/libc/string/generic/Makefile.in b/libc/string/generic/Makefile.in index 2273181d5..82910172a 100644 --- a/libc/string/generic/Makefile.in +++ b/libc/string/generic/Makefile.in @@ -9,23 +9,19 @@ STRING_GENERIC_DIR:=$(top_srcdir)libc/string/generic STRING_GENERIC_OUT:=$(top_builddir)libc/string/generic STRING_GENERIC_SRC:=$(wildcard $(STRING_GENERIC_DIR)/*.c) -MOBJ:=$(patsubst $(STRING_GENERIC_DIR)/%.c,%.o,$(STRING_GENERIC_SRC)) ifeq ($(UCLIBC_HAS_STRING_ARCH_OPT),y) ifneq ($(strip $(STRING_ARCH_OBJS)),) -MOBJ:=$(filter-out $(notdir $(STRING_ARCH_OBJS)),$(MOBJ)) +STRING_GENERIC_SRC:=$(filter-out $(patsubst %.o,$(STRING_GENERIC_DIR)/%.c,$(notdir $(STRING_ARCH_OBJS))),$(STRING_GENERIC_SRC)) endif endif -STRING_GENERIC_OBJ:=$(patsubst %.o,$(STRING_GENERIC_OUT)/%.o,$(MOBJ)) - -STRING_GENERIC_OBJS:=$(STRING_GENERIC_OBJ) +STRING_GENERIC_OBJS:=$(patsubst $(STRING_GENERIC_DIR)/%.c,$(STRING_GENERIC_OUT)/%.o,$(STRING_GENERIC_SRC)) libc-a-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS) libc-so-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS:.o=.os) -#libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC) -libc-nomulti-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_OBJS) +libc-multi-$(UCLIBC_HAS_STRING_GENERIC_OPT)+=$(STRING_GENERIC_SRC) objclean-y+=string_generic_objclean |