diff options
author | Felix Fietkau <nbd@openwrt.org> | 2010-10-31 15:33:48 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2010-10-31 15:33:48 +0000 |
commit | b34a0b3282e9effa31888c2e6bdc79d53dfe9c81 (patch) | |
tree | c9f1bdbcc43911ab34bb33b2a9f51c051729e2eb | |
parent | f742f85c2ec852e77906590e6fb17dc3f3bd74c8 (diff) | |
download | upstream-b34a0b3282e9effa31888c2e6bdc79d53dfe9c81.tar.gz upstream-b34a0b3282e9effa31888c2e6bdc79d53dfe9c81.tar.bz2 upstream-b34a0b3282e9effa31888c2e6bdc79d53dfe9c81.zip |
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
-rw-r--r-- | rules.mk | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 |