[xen staging] x86: fix build race when generating temporary object files (take 2)

[patchbot@xxxxxxx]

commit 8c90dbb99907f3b471d558775777a84daec7c3f6
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri May 28 09:12:24 2021 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri May 28 09:12:24 2021 +0200

    x86: fix build race when generating temporary object files (take 2)
    
    The original commit wasn't quite sufficient: Emptying DEPS is helpful
    only when nothing will get added to it subsequently. xen/Rules.mk will,
    after including the local Makefile, amend DEPS by dependencies for
    objects living in sub-directories though. For the purpose of suppressing
    dependencies of the makefiles on the .*.d2 files (and thus to avoid
    their re-generation) it is, however, not necessary at all to play with
    DEPS. Instead we can override DEPS_INCLUDE (which generally is a late-
    expansion variable).
    
    Fixes: 761bb575ce97 ("x86: fix build race when generating temporary object 
files")
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile
index 1f5887afc4..2ec883456e 100644
--- a/xen/arch/x86/Makefile
+++ b/xen/arch/x86/Makefile
@@ -313,5 +313,5 @@ clean::
 # Suppress loading of DEPS files for internal, temporary target files.  This
 # then also suppresses re-generation of the respective .*.d2 files.
 ifeq ($(filter-out .xen%.o,$(notdir $(MAKECMDGOALS))),)
-DEPS:=
+DEPS_INCLUDE:=
 endif
--
generated by git-patchbot for /home/xen/git/xen.git#staging