diff --git a/rules.mk b/rules.mk index f0c813620a991bd5ef65509c964aa6f2d9f25675..11ed80950a786ef2856059f8e353f4798b8e0e8b 100644 --- a/rules.mk +++ b/rules.mk @@ -333,12 +333,16 @@ endef # Execute commands under flock # $(1) => The shell expression. # $(2) => The lock name. If not given, the global lock will be used. -define locked +ifneq ($(wildcard $(STAGING_DIR_HOST)/bin/flock),) + define locked SHELL= \ - $(STAGING_DIR_HOST)/bin/flock \ + flock \ $(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \ -c '$(subst ','\'',$(1))' -endef + endef +else + locked=$(1) +endif # Recursively copy paths into another directory, purge dangling # symlinks before.