From: Anthony PERARD Date: Thu, 9 Feb 2023 16:14:48 +0000 (+0000) Subject: libs/util: Fix parallel build between flex/bison and CC rules X-Git-Tag: 4.18.0-rc1~1096 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf652a50fb3bb3b1b3d93db6fb79bc28f978fe75;p=xen.git libs/util: Fix parallel build between flex/bison and CC rules flex/bison generate two targets, and when those targets are prerequisite of other rules they are considered independently by make. We can have a situation where the .c file is out-of-date but not the .h, git checkout for example. In this case, if a rule only have the .h file as prerequiste, make will procced and start to build the object. In parallel, another target can have the .c file as prerequisite and make will find out it need re-generating and do so, changing the .h at the same time. This parallel task breaks the first one. To avoid this scenario, we put both the header and the source as prerequisite for all object even if they only need the header. Reported-by: Andrew Cooper Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- diff --git a/tools/libs/util/Makefile b/tools/libs/util/Makefile index e016baf888..c3b21875dc 100644 --- a/tools/libs/util/Makefile +++ b/tools/libs/util/Makefile @@ -40,6 +40,14 @@ include $(XEN_ROOT)/tools/libs/libs.mk $(OBJS-y) $(PIC_OBJS): $(AUTOINCS) +# Adding the .c conterparts of the headers generated by flex/bison as +# prerequisite of all objects. +# This is to tell make that if only the .c file is out-of-date but not the +# header, it should still wait for the .c file to be rebuilt. +# Otherwise, make doesn't considered "%.c %.h" as grouped targets, and will run +# the flex/bison rules in parallel of CC rules which only need the header. +$(OBJS-y) $(PIC_OBJS): libxlu_cfg_l.c libxlu_cfg_y.c libxlu_disk_l.c + %.c %.h:: %.y @rm -f $*.[ch] $(BISON) --output=$*.c $<