Browse Source

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
Felix Fietkau 15 years ago
parent
commit
b34a0b3282
1 changed files with 4 additions and 3 deletions
  1. 4 3
      rules.mk

+ 4 - 3
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