From 19c802ed8df34865714fe9240aac2bd663ae7fce Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Thu, 5 Feb 2026 20:57:18 -0500
Subject: [PATCH] Set GOFLAGS in Makefile; bump minimum iOS version

---
 xcode/Makefile     | 3 +++
 xcode/clangwrap.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xcode/Makefile b/xcode/Makefile
index 1e10114..1f79afc 100644
--- a/xcode/Makefile
+++ b/xcode/Makefile
@@ -9,6 +9,7 @@ ios-hw: clean
 	GOOS=ios \
 	GOARCH=arm64 \
 	GOARM64=v8.3,crypto \
+	GOFLAGS='-trimpath "-ldflags=-s -w" -buildvcs=false' \
 	SDK=iphoneos \
 	CC=$(PWD)/clangwrap.sh \
 	CGO_CFLAGS="-fembed-bitcode" \
@@ -22,6 +23,7 @@ ios-sim: clean
 	GOOS=ios \
 	GOARCH=arm64 \
 	GOARM64=v8.4,crypto \
+	GOFLAGS='-trimpath "-ldflags=-s -w" -buildvcs=false' \
 	SDK=iphonesimulator \
 	CC=$(PWD)/clangwrap.sh \
 	go build -buildmode=c-archive -tags ios -o $(BUILD_DIR)/cmutton-ios-sim.a ..
@@ -34,6 +36,7 @@ macos: clean
 	GOOS=darwin \
 	GOARCH=arm64 \
 	GOARM64=v8.4,crypto \
+	GOFLAGS='-trimpath "-ldflags=-s -w" -buildvcs=false' \
 	SDK=macosx \
 	go build -buildmode=c-archive -o $(BUILD_DIR)/cmutton-macos.a ..
 	echo '#import "types.h"\n#import "cmutton-macos.h"' > $(BUILD_DIR)/cmutton-Bridging-Header-macos.h
diff --git a/xcode/clangwrap.sh b/xcode/clangwrap.sh
index 1914b01..cb790b0 100755
--- a/xcode/clangwrap.sh
+++ b/xcode/clangwrap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MIN_VERSION=26.0
+MIN_VERSION=26.2
 
 SDK_PATH=`xcrun --sdk $SDK --show-sdk-path`
 CLANG=`xcrun --sdk $SDK --find clang`