From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Thu, 20 Dec 2018 19:47:42 +0000 (+0100)
Subject: wireguard-go-bridge: SDK_DIR is not defined for simulator
X-Git-Tag: 0.0.20181225-1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b23578dc7c5ed28a749de1a23359f08a77e86fa0;p=thirdparty%2Fwireguard-apple.git

wireguard-go-bridge: SDK_DIR is not defined for simulator

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

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