From 913e1718cdb3168117555287b99d00d6e6fed55d Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 15 Jul 2014 12:28:12 +0200 Subject: [PATCH] build system: fix another cbfstool race MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It just doesn't work to have files depend on their parent directory: As soon as the files are written, the time stamp of the directory changes, too. This led to spurious updates of cbfstool and rmodtool, and related "permission denied" errors when linker and build system ran into each other. Change-Id: I44a7d7b4b1d47a1567ece1f57dfd6745d05ee651 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/6276 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Kyösti Mälkki --- util/cbfstool/Makefile.inc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 0548ea40d0..410d96c702 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -27,9 +27,6 @@ ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32) TOOLFLAGS+=-mno-ms-bitfields endif -$(objutil)/cbfstool: - mkdir -p $@ - $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/%.c printf " HOSTCC $(subst $(objutil)/,,$(@))\n" $(HOSTCC) $(TOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $< @@ -42,10 +39,10 @@ $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/%.c printf " HOSTCC $(subst $(objutil)/,,$(@))\n" $(HOSTCC) $(TOOLFLAGS) $(HOSTCFLAGS) -c -o $@ $< -$(objutil)/cbfstool/cbfstool: $(objutil)/cbfstool $(addprefix $(objutil)/cbfstool/,$(cbfsobj)) +$(objutil)/cbfstool/cbfstool: $(addprefix $(objutil)/cbfstool/,$(cbfsobj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" $(HOSTCC) $(TOOLFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(cbfsobj)) -$(objutil)/cbfstool/rmodtool: $(objutil)/cbfstool $(addprefix $(objutil)/cbfstool/,$(rmodobj)) +$(objutil)/cbfstool/rmodtool: $(addprefix $(objutil)/cbfstool/,$(rmodobj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" $(HOSTCC) $(TOOLFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(rmodobj))