aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-08-22 09:28:46 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-08-22 09:28:46 +0200
commitadbe3b5b982874071b9b826cea1632fc00c85982 (patch)
tree078474936a4e43d1987c8801ca3b017349986a5d
parente7b0a9e5bc60617fb00c321430253d7771d40fd3 (diff)
downloadbusybox-w32-adbe3b5b982874071b9b826cea1632fc00c85982.tar.gz
busybox-w32-adbe3b5b982874071b9b826cea1632fc00c85982.tar.bz2
busybox-w32-adbe3b5b982874071b9b826cea1632fc00c85982.zip
build system: make 3.82 fix. Closes bug 2323
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 2d6a3b2a0..d13abc887 100644
--- a/Makefile
+++ b/Makefile
@@ -433,7 +433,12 @@ ifeq ($(config-targets),1)
433-include $(srctree)/arch/$(ARCH)/Makefile 433-include $(srctree)/arch/$(ARCH)/Makefile
434export KBUILD_DEFCONFIG 434export KBUILD_DEFCONFIG
435 435
436config %config: scripts_basic outputmakefile gen_build_files FORCE 436config: scripts_basic outputmakefile gen_build_files FORCE
437 $(Q)mkdir -p include
438 $(Q)$(MAKE) $(build)=scripts/kconfig $@
439 $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
440
441%config: scripts_basic outputmakefile gen_build_files FORCE
437 $(Q)mkdir -p include 442 $(Q)mkdir -p include
438 $(Q)$(MAKE) $(build)=scripts/kconfig $@ 443 $(Q)$(MAKE) $(build)=scripts/kconfig $@
439 $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease 444 $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
@@ -1285,9 +1290,13 @@ endif
1285 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) 1290 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
1286 1291
1287# Modules 1292# Modules
1288/ %/: prepare scripts FORCE 1293%/: prepare scripts FORCE
1289 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ 1294 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
1290 $(build)=$(build-dir) 1295 $(build)=$(build-dir)
1296/: prepare scripts FORCE
1297 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
1298 $(build)=$(build-dir)
1299
1291%.ko: prepare scripts FORCE 1300%.ko: prepare scripts FORCE
1292 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ 1301 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
1293 $(build)=$(build-dir) $(@:.ko=.o) 1302 $(build)=$(build-dir) $(@:.ko=.o)