summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.lib4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index ab209ad5830e..95026d841a1c 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -130,8 +130,8 @@ c_flags = -Wp,-MD,$(depfile) $(CFLAGS) $(NOSTDINC_FLAGS) \
$(basename_flags) $(modname_flags) $(export_flags)
# Finds the multi-part object the current object will be linked into
-modname-multi = $(subst $(space),_,$(strip $(foreach m,$(multi-used),\
- $(if $(filter $(*F).o,$($(m:.o=-objs))),$(m:.o=)))))
+modname-multi = $(subst $(space),_,$(sort $(foreach m,$(multi-used),\
+ $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=)))))
# Shipped files
# ===========================================================================