From 067331b12da8e355c501e60a84c3c80ea131d442 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Sun, 8 Jan 2012 21:54:43 +0100 Subject: [PATCH] --- yaml --- r: 285811 b: refs/heads/master c: 5bb0571bfddcdcd3fbf42a58fcce4d0b743fe62f h: refs/heads/master i: 285809: e5e2473278391e1a1721d6dbcd5334ef796ebebe 285807: 43ed53ddc29cc4761fbc5502c7af747e0aa9ddd8 v: v3 --- [refs] | 2 +- trunk/scripts/Makefile.lib | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 84525c5e521b..501db68c1274 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 603d8c0adb0f7576f92fc435c69be9406dc60762 +refs/heads/master: 5bb0571bfddcdcd3fbf42a58fcce4d0b743fe62f diff --git a/trunk/scripts/Makefile.lib b/trunk/scripts/Makefile.lib index 5d986d9adf1b..2ce2e2194f26 100644 --- a/trunk/scripts/Makefile.lib +++ b/trunk/scripts/Makefile.lib @@ -93,9 +93,9 @@ obj-dirs := $(addprefix $(obj)/,$(obj-dirs)) # already # $(modname_flags) #defines KBUILD_MODNAME as the name of the module it will # end up in (or would, if it gets compiled in) -# Note: It's possible that one object gets potentially linked into more -# than one module. In that case KBUILD_MODNAME will be set to foo_bar, -# where foo and bar are the name of the modules. +# Note: Files that end up in two or more modules are compiled without the +# KBUILD_MODNAME definition. The reason is that any made-up name would +# differ in different configs. name-fix = $(subst $(comma),_,$(subst -,_,$1)) basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))" modname_flags = $(if $(filter 1,$(words $(modname))),\