zcy
/
pluto_hdl_adi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <travis.collins@analog.com>
main
Jorge Marques 2024-04-09 15:41:34 -03:00 committed by GitHub
parent 74089397b3
commit 22ff237010
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/scripts/project-xilinx.mk
View File

@ -118,7 +118,7 @@ $(PROJECT_NAME).sdk/system_top.xsa: $(M_DEPS)
$(HDL_LIBRARY_PATH)%/component.xml: TARGET:=xilinx $(HDL_LIBRARY_PATH)%/component.xml: TARGET:=xilinx
FORCE: FORCE:
$(HDL_LIBRARY_PATH)%/component.xml: FORCE $(HDL_LIBRARY_PATH)%/component.xml: FORCE
flock $(dir $@).lock -c " \ flock $(dir $@).lock sh -c " \
if [ -n \"${REQUIRED_VIVADO_VERSION}\" ]; then \ if [ -n \"${REQUIRED_VIVADO_VERSION}\" ]; then \
$(MAKE) -C $(dir $@) $(TARGET) REQUIRED_VIVADO_VERSION=${REQUIRED_VIVADO_VERSION}; \ $(MAKE) -C $(dir $@) $(TARGET) REQUIRED_VIVADO_VERSION=${REQUIRED_VIVADO_VERSION}; \
else \ else \