Skip to contentSkip to conversation

fix kbuild regression

GIT PULL Sam Ravnborg 1 participant 1 message May 31, 2008 Kbuild

lore
Share & tools
lore
#0 lore raw

Hi Linus.

Please pull from:

ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git

Sam

To get the following fix:

Sam Ravnborg (1):
kbuild: fix $(src) assignmnet with external modules

When we introduced support for KBUILD_EXTRA_SYMBOLS we started to include the externam module's kbuild file when doing the final modpost step.

As external modules often do:
ccflags-y := -I$(src)

We had problems because $(src) was unassinged and gcc then used the next parameter for -I resulting in strange build failures.

Fix is to assign $(src) and $(obj) when building external modules.

This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=10798

Cc Tvrtko <[email protected]>
Cc Andrea Arcangeli <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
 scripts/Makefile.modpost |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
scripts/Makefile.modpost +6 -0
index a098a04..17092d6 100644
@@ -43,7 +43,13 @@ _modpost: __modpost
 include include/config/auto.conf
 include scripts/Kbuild.include
 
+# When building external modules load the Kbuild file to retreive EXTRA_SYMBOLS info
 ifneq ($(KBUILD_EXTMOD),)
+
+# set src + obj - they may be used when building the .mod.c file
+obj := $(KBUILD_EXTMOD)
+src := $(obj)
+
 # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
 include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
              $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)