From b34a0b3282e9effa31888c2e6bdc79d53dfe9c81 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 31 Oct 2010 15:33:48 +0000 Subject: [PATCH] fix usage of flock - use the command mode instead of locking a file descriptor to fix build issues on mac os x SVN-Revision: 23743 --- rules.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rules.mk b/rules.mk index 007e5bc9b2..3bd6073fb7 100644 --- a/rules.mk +++ b/rules.mk @@ -254,9 +254,10 @@ endef # $(2) => The lock name. If not given, the global lock will be used. # $(3) => The filedescriptor used for the lock. Defaults to 1023. define locked - ( $(STAGING_DIR_HOST)/bin/flock -x $(if $(3),$(3),1023) && \ - $(1) \ - ) $(if $(3),$(strip $(3)),1023)>$(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock + SHELL= \ + $(STAGING_DIR_HOST)/bin/flock \ + $(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \ + -c '$(subst ','\'',$(1))' endef # file extension