diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2018-12-20 20:47:42 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-12-20 20:47:49 +0100 |
| commit | b23578dc7c5ed28a749de1a23359f08a77e86fa0 (patch) | |
| tree | 3aa3aca5d5407f2340ca26248b3dcf9ae23efb38 | |
| parent | Enabled more swiftlint rules (diff) | |
| download | wireguard-apple-b23578dc7c5ed28a749de1a23359f08a77e86fa0.tar.xz wireguard-apple-b23578dc7c5ed28a749de1a23359f08a77e86fa0.zip | |
wireguard-go-bridge: SDK_DIR is not defined for simulator
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | wireguard-go-bridge/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wireguard-go-bridge/Makefile b/wireguard-go-bridge/Makefile index 3cba7dc..6c28153 100644 --- a/wireguard-go-bridge/Makefile +++ b/wireguard-go-bridge/Makefile @@ -5,7 +5,7 @@ # These are generally passed to us by xcode, but we set working defaults for standalone compilation too. ARCHS ?= arm64 armv7 SDK_NAME ?= iphoneos -SDK_DIR ?= $(shell xcrun --sdk $(SDK_NAME) --show-sdk-path) +SDKROOT ?= $(shell xcrun --sdk $(SDK_NAME) --show-sdk-path) CONFIGURATION_BUILD_DIR ?= $(CURDIR)/out CONFIGURATION_TEMP_DIR ?= $(CURDIR)/.tmp @@ -16,7 +16,7 @@ BUILDDIR ?= $(CONFIGURATION_TEMP_DIR)/wireguard-go-bridge UPSTREAM_FILES := $(filter-out %/main.go %/queueconstants.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go)) ../wireguard-go/go.mod ../wireguard-go/go.sum DOWNSTREAM_FILES := $(wildcard src/*.go) $(wildcard src/*/*.go) -CFLAGS_PREFIX := $(DEPLOYMENT_TARGET_CLANG_FLAG_PREFIX)$($(DEPLOYMENT_TARGET_CLANG_ENV_NAME)) -isysroot $(SDK_DIR) -arch +CFLAGS_PREFIX := $(DEPLOYMENT_TARGET_CLANG_FLAG_PREFIX)$($(DEPLOYMENT_TARGET_CLANG_ENV_NAME)) -isysroot $(SDKROOT) -arch GOARCH_arm64 := arm64 GOARCH_armv7 := arm GOARCH_x86_64 := amd64 |