Enable building universal app on ARM mac

2 files changed, 20 insertions, 7 deletions

diff --git a/env.sh b/env.sh
index a952769ce6..f48aa80415 100755
--- a/env.sh
+++ b/env.sh
@@ -30,6 +30,12 @@ case "$ENV_TARGET" in
     ;;
   x86_64-*-darwin*)
     export MACOSX_DEPLOYMENT_TARGET="10.7"
+
+    if [[ $HOST != "$ENV_TARGET" ]]; then
+        # Required for building daemon
+        SDKROOT=$(xcrun --show-sdk-path)
+        export SDKROOT
+    fi
     ;;
   aarch64-*-darwin*)
     export MACOSX_DEPLOYMENT_TARGET="11.0"
diff --git a/wireguard/build-wireguard-go.sh b/wireguard/build-wireguard-go.sh
index 739116b41b..f800634f73 100755
--- a/wireguard/build-wireguard-go.sh
+++ b/wireguard/build-wireguard-go.sh
@@ -97,16 +97,23 @@ function build_unix {
             export CC=aarch64-linux-gnu-gcc
         fi
 
-        # Apple silicon
-        if [[ "$1" == "aarch64-apple-darwin" ]]; then
+        # Environment flags for cross compiling on macOS
+        if [[ "$1" == *-apple-darwin ]]; then
             export CGO_ENABLED=1
             export GOOS=darwin
-            export GOARCH=arm64
-            export CC="$(xcrun -sdk $SDKROOT --find clang) -arch $GOARCH -isysroot $SDKROOT"
-            export CFLAGS="-isysroot $SDKROOT -arch $GOARCH -I$SDKROOT/usr/include"
+
+            local arch=x86_64
+            export GOARCH=amd64
+            if [[ "$1" == aarch64-* ]]; then
+                arch=arm64
+                export GOARCH=arm64
+            fi
+
+            export CC="$(xcrun -sdk $SDKROOT --find clang) -arch $arch -isysroot $SDKROOT"
+            export CFLAGS="-isysroot $SDKROOT -arch $arch -I$SDKROOT/usr/include"
             export LD_LIBRARY_PATH="$SDKROOT/usr/lib"
-            export CGO_CFLAGS="-isysroot $SDKROOT -arch $GOARCH"
-            export CGO_LDFLAGS="-isysroot $SDKROOT -arch $GOARCH"
+            export CGO_CFLAGS="-isysroot $SDKROOT -arch $arch"
+            export CGO_LDFLAGS="-isysroot $SDKROOT -arch $arch"
         fi
     fi