From c1e86acb3c41f5f2d6ce0107d1a8be951f2f3595 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 1 Apr 2020 17:48:04 -0600 Subject: tunnel: libwg-go: remove -x option from flock It's already the default and the macOS port of flock doesn't support it. Signed-off-by: Jason A. Donenfeld --- tunnel/tools/libwg-go/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tunnel/tools') diff --git a/tunnel/tools/libwg-go/Makefile b/tunnel/tools/libwg-go/Makefile index 44e7c2be..1a83959a 100644 --- a/tunnel/tools/libwg-go/Makefile +++ b/tunnel/tools/libwg-go/Makefile @@ -30,7 +30,7 @@ default: $(DESTDIR)/libwg-go.so $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL): mkdir -p "$(dir $@)" - flock -x "$@.lock" -c ' \ + flock "$@.lock" -c ' \ [ -f "$@" ] && exit 0; \ curl -o "$@.tmp" "https://dl.google.com/go/$(GO_TARBALL)" && \ echo "$(GO_HASH_$(GO_PLATFORM)) $@.tmp" | sha256sum -c && \ @@ -38,7 +38,7 @@ $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL): $(BUILDDIR)/go-$(GO_VERSION)/.prepared: $(GRADLE_USER_HOME)/caches/golang/$(GO_TARBALL) mkdir -p "$(dir $@)" - flock -x "$@.lock" -c ' \ + flock "$@.lock" -c ' \ [ -f "$@" ] && exit 0; \ tar -C "$(dir $@)" --strip-components=1 -xzf "$^" && \ patch -p1 -f -N -r- -d "$(dir $@)" < goruntime-boottime-over-monotonic.diff && \ -- cgit v1.2.3