diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-03-19 13:57:26 -0600 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-03-19 21:23:46 +0100 |
| commit | b21fdfed67a86b1a288bfe7a22f41b6c7ee01dcd (patch) | |
| tree | 13cbb7f97c8412cc57bb3c20c0fbe51eb1bb6956 /wireguard-go-bridge/Makefile | |
| parent | iOS: Delete confirmation prompt should be a question (diff) | |
| download | wireguard-apple-b21fdfed67a86b1a288bfe7a22f41b6c7ee01dcd.tar.xz wireguard-apple-b21fdfed67a86b1a288bfe7a22f41b6c7ee01dcd.zip | |
wireguard-go-bridge: do not use getdirentries64 on macos
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'wireguard-go-bridge/Makefile')
| -rw-r--r-- | wireguard-go-bridge/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/wireguard-go-bridge/Makefile b/wireguard-go-bridge/Makefile index ae9fa09..af319ad 100644 --- a/wireguard-go-bridge/Makefile +++ b/wireguard-go-bridge/Makefile @@ -26,7 +26,7 @@ export CGO_ENABLED := 1 build: $(DESTDIR)/libwg-go.a version-header: $(DESTDIR)/wireguard-go-version.h -GOBUILDVERSION_NEEDED := go version go1.12 darwin/amd64 +GOBUILDVERSION_NEEDED := go version go1.12.1 darwin/amd64 GOBUILDVERSION_CURRENT := $(shell go version 2>/dev/null) export REAL_GOROOT := $(shell go env GOROOT 2>/dev/null) export GOROOT := $(BUILDDIR)/goroot @@ -44,7 +44,10 @@ $(GOROOT)/.prepared: [ -n "$(REAL_GOROOT)" ] mkdir -p "$(GOROOT)" rsync -a --delete --exclude=pkg/obj/go-build "$(REAL_GOROOT)/" "$(GOROOT)/" - patch -p1 -f -N -r- -d "$(GOROOT)" < goruntime-boottime-over-monotonic.diff + cat goruntime-*.diff | patch -p1 -f -N -r- -d "$(GOROOT)" + rm -rf "$(GOPATH)/pkg/mod" + go get -d -tags ios; chmod -fR +w "$(GOPATH)/pkg/mod" + for sys in "$(GOPATH)/pkg/mod/golang.org/x/sys@"*; do cat sys-unix-*.diff | patch -p1 -f -N -r- -d "$$sys"; done touch "$@" $(shell test "$$(cat "$(BUILDDIR)/.gobuildversion" 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.a") @@ -63,7 +66,6 @@ endef $(foreach ARCH,$(ARCHS),$(eval $(call libwg-go-a,$(ARCH)))) $(DESTDIR)/wireguard-go-version.h: go.mod $(GOROOT)/.prepared - go get -d -tags ios; chmod -fR +w "$(GOPATH)/pkg/mod" wggo="$(GOPATH)/pkg/mod/$$(sed -n 's/.*\(golang\.zx2c4\.com\/wireguard\) \(.*\)$$/\1@\2/p' go.mod)"; \ sed -n 's/.*WireGuardGoVersion = "\(.*\)"/#define WIREGUARD_GO_VERSION "\1"/p' "$$wggo/device/version.go" > "$@" |