pflash: Fix makefile dependency issue

Message ID 20180212031032.10900-1-stewart@linux.vnet.ibm.com
State Accepted
Headers show
Series
  • pflash: Fix makefile dependency issue
Related show

Commit Message

Stewart Smith Feb. 12, 2018, 3:10 a.m.
Otherwise we could end up trying to build files before the links
are created.

Let's use a heavy handed approach and not build *anything* until
we have the links.

Reported-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
---
 external/pflash/rules.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Stewart Smith Feb. 15, 2018, 6:46 a.m. | #1
Stewart Smith <stewart@linux.vnet.ibm.com> writes:
> Otherwise we could end up trying to build files before the links
> are created.
>
> Let's use a heavy handed approach and not build *anything* until
> we have the links.
>
> Reported-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
> Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
> ---
>  external/pflash/rules.mk | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Merged to master as of 6d965ea72ad85ff23059e0d7ff657070be67dbdc and in
v5.10-rc3

Patch

diff --git a/external/pflash/rules.mk b/external/pflash/rules.mk
index 9dff002670b3..3ee82b50e241 100644
--- a/external/pflash/rules.mk
+++ b/external/pflash/rules.mk
@@ -37,17 +37,17 @@  version.c: .version
 	echo "const char version[] = \"$(PFLASH_VERSION)\";" ;\
 	fi) > $@
 
-%.o : %.c
+%.o : %.c | links
 	$(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
 
 $(LIBFLASH_SRC): | links
 
 $(CCAN_SRC): | links
 
-$(LIBFLASH_OBJS): libflash-%.o : libflash/%.c
+$(LIBFLASH_OBJS): libflash-%.o : libflash/%.c | links
 	$(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
 
-$(CCAN_OBJS): ccan-list-%.o: ccan/list/%.c
+$(CCAN_OBJS): ccan-list-%.o: ccan/list/%.c | links
 	$(Q_CC)$(CC) $(CFLAGS) -c $< -o $@
 
 $(EXE): $(OBJS)