af694a4b2
Ron Yorston
2018-11-18
Subject
Ensure build works when KBUILD_OUTPUT is set, closes 11511
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
Makefile+2 -2
| @@ -361,7 +361,7 @@ scripts/basic/%: scripts_basic ; | |
| # This target generates Kbuild's and Config.in's from *.c files | |
| PHONY += gen_build_files | |
| - | gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard embed/*) |
| + | gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard $(srctree)/embed/*) |
| $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree) | |
| # bbox: we have helpers in applets/ | |
| @@ -853,7 +853,7 @@ quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/* | |
| quiet_cmd_gen_embedded_scripts = GEN include/embedded_scripts.h | |
| cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh | |
| #bbox# piggybacked generation of few .h files | |
| - | include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard embed/*) scripts/embedded_scripts |
| + | include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard $(srctree)/embed/*) $(srctree)/scripts/embedded_scripts |
| $(call cmd,split_autoconf) | |
| $(call cmd,gen_bbconfigopts) | |
| $(call cmd,gen_common_bufsiz) | |
scripts/embedded_scripts+1 -1
| @@ -20,7 +20,7 @@ if [ -d "$custom_loc" ] | |
| then | |
| custom_scripts=$(cd $custom_loc; ls * 2>/dev/null) | |
| fi | |
| - | all_scripts=$(applets/busybox.mkscripts) |
| + | all_scripts=$($srctree/applets/busybox.mkscripts) |
| # all_scripts includes applet scripts and custom scripts, sort them out | |
| applet_scripts="" | |