From 22ff237010dc20404f7e26211f6b4b8c41be1a3a Mon Sep 17 00:00:00 2001 From: Jorge Marques <2892061+gastmaier@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:41:34 -0300 Subject: [PATCH] Tell flock to use sh (#1303) With the new make -jX support flock is used but shells out sometimes. This assumes a bash like shell which isn't always the case. This fix forces flock to use sh. Signed-off-by: Travis F. Collins --- projects/scripts/project-xilinx.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/scripts/project-xilinx.mk b/projects/scripts/project-xilinx.mk index 45f15c373..3af8dd13a 100644 --- a/projects/scripts/project-xilinx.mk +++ b/projects/scripts/project-xilinx.mk @@ -118,7 +118,7 @@ $(PROJECT_NAME).sdk/system_top.xsa: $(M_DEPS) $(HDL_LIBRARY_PATH)%/component.xml: TARGET:=xilinx FORCE: $(HDL_LIBRARY_PATH)%/component.xml: FORCE - flock $(dir $@).lock -c " \ + flock $(dir $@).lock sh -c " \ if [ -n \"${REQUIRED_VIVADO_VERSION}\" ]; then \ $(MAKE) -C $(dir $@) $(TARGET) REQUIRED_VIVADO_VERSION=${REQUIRED_VIVADO_VERSION}; \ else \