lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[make] Defer binding of EXTRA_BUILDDEPS to all::

Browse Source 
Currently EXTRA_BUILDDEPS is evaluated before build.mk. This means that
userspace apps or other EXTRA_BUILDRULES cannot add items to
EXTRA_BUILDDEPS and have it function as would be expected.

Bug: 143636864
Change-Id: Idc1504b09f31b4c54148bb6892193d11f45e08ff
This commit is contained in:
Nick Bray
2021-02-10 21:34:04 -08:00
committed by Travis Geiselbrecht
parent 7e502816f6
commit 3f549a2e25
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine.mk
View File

@@ -167,9 +167,6 @@ include top/rules.mk
# modules in the ALLMODULES list
include make/recurse.mk
# any extra top level build dependencies that someone declared
all:: $(EXTRA_BUILDDEPS)
# add some automatic configuration defines
GLOBAL_DEFINES += \
PROJECT_$(PROJECT)=1 \
@@ -264,6 +261,10 @@ $(info GLOBAL_OPTFLAGS = $(GLOBAL_OPTFLAGS))
# make all object files depend on any targets in GLOBAL_SRCDEPS
$(ALLOBJS): $(GLOBAL_SRCDEPS)
# any extra top level build dependencies that someone declared.
# build.mk may add to EXTRA_BUILDDEPS, this must be evalauted after build.mk.
all:: $(EXTRA_BUILDDEPS)
clean: $(EXTRA_CLEANDEPS)
rm -f $(ALLOBJS) $(DEPS) $(GENERATED) $(OUTBIN) $(OUTELF) $(OUTELF).lst $(OUTELF).debug.lst $(OUTELF).sym $(OUTELF).sym.sorted $(OUTELF).size $(OUTELF).hex $(OUTELF).dump