aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2018-11-18 07:40:40 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2018-11-18 19:34:39 +0100
commitaf694a4b290e9c664919c8c7bcc98a89dd2fbb7d (patch)
tree81184f076fe0adf4483a2b42f48cf7c2ca61e1df /Makefile
parentd1b2ae2d04eae05d76ad3c1a07e9092c7d46c773 (diff)
downloadbusybox-w32-af694a4b290e9c664919c8c7bcc98a89dd2fbb7d.tar.gz
busybox-w32-af694a4b290e9c664919c8c7bcc98a89dd2fbb7d.tar.bz2
busybox-w32-af694a4b290e9c664919c8c7bcc98a89dd2fbb7d.zip
Ensure build works when KBUILD_OUTPUT is set, closes 11511
The build process for embedded scripts didn't have consistent support for saving output to a different directory. Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c19280476..4b5a01df9 100644
--- a/Makefile
+++ b/Makefile
@@ -361,7 +361,7 @@ scripts/basic/%: scripts_basic ;
361 361
362# This target generates Kbuild's and Config.in's from *.c files 362# This target generates Kbuild's and Config.in's from *.c files
363PHONY += gen_build_files 363PHONY += gen_build_files
364gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard embed/*) 364gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard $(srctree)/embed/*)
365 $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree) 365 $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
366 366
367# bbox: we have helpers in applets/ 367# bbox: we have helpers in applets/
@@ -853,7 +853,7 @@ quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/*
853quiet_cmd_gen_embedded_scripts = GEN include/embedded_scripts.h 853quiet_cmd_gen_embedded_scripts = GEN include/embedded_scripts.h
854 cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh 854 cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh
855#bbox# piggybacked generation of few .h files 855#bbox# piggybacked generation of few .h files
856include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard embed/*) scripts/embedded_scripts 856include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard $(srctree)/embed/*) $(srctree)/scripts/embedded_scripts
857 $(call cmd,split_autoconf) 857 $(call cmd,split_autoconf)
858 $(call cmd,gen_bbconfigopts) 858 $(call cmd,gen_bbconfigopts)
859 $(call cmd,gen_common_bufsiz) 859 $(call cmd,gen_common_bufsiz)