On Wed, Dec 04, 2019 at 11:11:34AM +0000, Peter Robinson wrote: > Commit 4d90f6cd9813 breaks parallel builds in 2020.01-rc series. This > fixes the issue, reverting it also fixes it. Not sure which is the best > route. > > Signed-off-by: Peter Robinson <pbrobin...@gmail.com> > --- > Makefile | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index 8024baaddf..4330c2f3a4 100644 > --- a/Makefile > +++ b/Makefile > @@ -1895,14 +1895,14 @@ checkarmreloc: u-boot > false; \ > fi > > -tools/version.h: include/version.h > +version.h: include/version.h > $(call if_changed,copy) > > -envtools: scripts_basic $(version_h) $(timestamp_h) tools/version.h > +envtools: scripts_basic $(version_h) $(timestamp_h) version.h > $(Q)$(MAKE) $(build)=tools/env > > tools-only: export TOOLS_ONLY=y > -tools-only: scripts_basic $(version_h) $(timestamp_h) tools/version.h > +tools-only: scripts_basic $(version_h) $(timestamp_h) version.h > $(Q)$(MAKE) $(build)=tools > > tools-all: export HOST_TOOLS_ALL=y
It's a heck of a build machine you're throwing this at I assume. Can you explain a bit more on how this is still the right set of dependencies? Assuming you haven't hooked up Azure so you can get a CI run of the Windows build, I'll take care of that as part of testing this in general, thanks. -- Tom
signature.asc
Description: PGP signature
