Skip to content

build: produce a universal (arm64 + x86_64) macOS slice #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
prakashrj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: produce a universal (arm64 + x86_64) macOS slice #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ libtailscale_ios_sim_arm64.a:
libtailscale_ios_sim_x86_64.a:
GOOS=ios GOARCH=amd64 CC=$(PWD)/swift/script/clangwrap-ios-sim-x86.sh go build -v -ldflags -w -tags ios -o $@ -buildmode=c-archive

libtailscale_macos_arm64.a:
GOOS=darwin GOARCH=arm64 CC=$(PWD)/swift/script/clangwrap-macos-arm.sh $(DARWIN_DEPLOYMENT_TARGET) go build -v -ldflags -w -o $@ -buildmode=c-archive

libtailscale_macos_x86_64.a:
GOOS=darwin GOARCH=amd64 CC=$(PWD)/swift/script/clangwrap-macos-x86.sh $(DARWIN_DEPLOYMENT_TARGET) go build -v -ldflags -w -o $@ -buildmode=c-archive

.PHONY: c-archive-macos-universal
c-archive-macos-universal: libtailscale_macos_arm64.a libtailscale_macos_x86_64.a ## Builds a universal (arm64 + x86_64) libtailscale.a for macOS
lipo -create -output libtailscale.a libtailscale_macos_arm64.a libtailscale_macos_x86_64.a

.PHONY: c-archive-ios
c-archive-ios: libtailscale_ios.a ## Builds libtailscale_ios.a for iOS (iOS SDK required)

Expand Down
5 changes: 3 additions & 2 deletions swift/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ all: test ios macos ios-fat ## Runs the tests and builds all library targets
macos: ## Builds TailscaleKit for macos to swift/build/Build/Products/Release (unsigned)
@echo
@echo "::: Building TailscaleKit.framework for macOS :::"
cd .. && make c-archive
cd .. && make c-archive-macos-universal
mkdir -p build
xcodebuild build -scheme "TailscaleKit (macOS)" \
-derivedDataPath build \
-configuration Release \
-destination 'platform=macOS,arch=arm64' \
-destination 'generic/platform=macOS' \
ARCHS="arm64 x86_64" ONLY_ACTIVE_ARCH=NO \
CODE_SIGNING_ALLOWED=NO | $(XCPRETTIFIER)

.PHONY: ios
Expand Down
11 changes: 11 additions & 0 deletions swift/script/clangwrap-macos-arm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

SDK=macosx
CLANGARCH=arm64

SDK_PATH=`xcrun --sdk $SDK --show-sdk-path`

# cmd/cgo doesn't support llvm-gcc-4.2, so we have to use clang.
CLANG=`xcrun --sdk $SDK --find clang`

exec "$CLANG" -arch $CLANGARCH -isysroot "$SDK_PATH" -mmacos-version-min=15.0 "$@"
11 changes: 11 additions & 0 deletions swift/script/clangwrap-macos-x86.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

SDK=macosx
CLANGARCH=x86_64

SDK_PATH=`xcrun --sdk $SDK --show-sdk-path`

# cmd/cgo doesn't support llvm-gcc-4.2, so we have to use clang.
CLANG=`xcrun --sdk $SDK --find clang`

exec "$CLANG" -arch $CLANGARCH -isysroot "$SDK_PATH" -mmacos-version-min=15.0 "$@"