Message ID | 1474059037-17224-1-git-send-email-patrick@stwcx.xyz |
---|---|
State | Accepted |
Headers | show |
Patrick Williams <patrick@stwcx.xyz> writes: > Commit fd599965 added some dependencies in 'external/pflash' > for libflash files that are created via symlink. Replicate > that same behavior in 'external/gard' to prevent race conditions > where we attempt to compile files from libflash before they are > symlink'd. > > Signed-off-by: Patrick Williams <patrick@stwcx.xyz> Looks good. Merged to: master: cd72d0f skiboot-5.3.x: d2c3eaa
diff --git a/external/gard/rules.mk b/external/gard/rules.mk index dfe93d5..3a7f6d9 100644 --- a/external/gard/rules.mk +++ b/external/gard/rules.mk @@ -2,7 +2,9 @@ override CFLAGS += -O2 -Wall -Werror -I. OBJS = version.o gard.o -LIBFLASH_OBJS += libflash-file.o libflash-libflash.o libflash-libffs.o libflash-ecc.o libflash-blocklevel.o +LIBFLASH_FILES := libflash.c libffs.c ecc.c blocklevel.c file.c +LIBFLASH_OBJS := $(addprefix libflash-, $(LIBFLASH_FILES:.c=.o)) +LIBFLASH_SRC := $(addprefix libflash/,$(LIBFLASH_FILES)) OBJS += $(LIBFLASH_OBJS) OBJS += common-arch_flash.o EXE = gard @@ -24,6 +26,8 @@ version.c: make_version.sh .version %.o : %.c $(CC) $(CFLAGS) -c $< -o $@ +$(LIBFLASH_SRC): | links + $(LIBFLASH_OBJS): libflash-%.o : libflash/%.c $(CC) $(CFLAGS) -c $< -o $@
Commit fd599965 added some dependencies in 'external/pflash' for libflash files that are created via symlink. Replicate that same behavior in 'external/gard' to prevent race conditions where we attempt to compile files from libflash before they are symlink'd. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> --- external/gard/rules.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)