diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-11-20 03:02:35 -0600 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-11-20 03:02:35 -0600 |
| commit | a8fae36436444710aa5139cc69ccbf83b66048c1 (patch) | |
| tree | 5f4323fb78be448a124d7e8bbd677c3336dc8f83 /scripts/Makefile.lib | |
| parent | 37256d28aacf841a25c62910abf586bd271e9632 (diff) | |
kbuild: Fix KBUILD_MODNAME
The KBUILD_MODNAME patch which got included lately dated back a couple
of months ago and thus got the following wrong:
o multi-part components which don't live in the local subdir
o using foo-y instead of foo-objs
Diffstat (limited to 'scripts/Makefile.lib')
| -rw-r--r-- | scripts/Makefile.lib | 4 |
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 # =========================================================================== |