fix(build): update macOS build configuration to support separate build architectures

Author: Gioee

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.container && matrix.container || '' }}
-    name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ' + test' || ''}}
+    name: ${{ matrix.name }}${{ matrix.arch && format('-{0}', matrix.arch) || '' }} build${{ matrix.arch != 'arm64-v8a' && matrix.name != 'ios-sim' && matrix.name != 'ios' && matrix.name != 'apple-xcframework' && matrix.name != 'android-aar' && ( matrix.name != 'macos' || matrix.arch != 'x86_64' ) && ' + test' || ''}}
     timeout-minutes: 20
     strategy:
       fail-fast: false
@@ -34,6 +34,14 @@ jobs:
           - os: macos-15
             name: macos
             make: COVERAGE=ON
+          - os: macos-15
+            arch: x86_64
+            name: macos
+            make: ARCH=x86_64
+          - os: macos-15
+            arch: arm64
+            name: macos
+            make: ARCH=arm64
           - os: windows-2022
             arch: x86_64
             name: windows
@@ -196,11 +204,11 @@ jobs:
             adb shell "sh /data/local/tmp/commands.sh"
 
       - name: test sqlite-sync
-        if: contains(matrix.name, 'linux') || matrix.name == 'windows' || matrix.name == 'macos'
+        if: contains(matrix.name, 'linux') || matrix.name == 'windows' || ( matrix.name == 'macos' && matrix.arch != 'x86_64' )
         run: ${{ matrix.name == 'linux-musl' && matrix.arch == 'arm64' && 'docker exec alpine' || '' }} make test ${{ matrix.make && matrix.make || ''}}
 
       - uses: actions/[email protected]
-        if: matrix.name == 'macos'
+        if: matrix.name == 'macos' && !matrix.arch
         with:
           path: coverage
 

Makefile

@@ -72,10 +72,17 @@ ifeq ($(PLATFORM),windows)
 	STRIP = strip --strip-unneeded $@
 else ifeq ($(PLATFORM),macos)
 	TARGET := $(DIST_DIR)/cloudsync.dylib
-	LDFLAGS += -arch x86_64 -arch arm64 -framework Security -dynamiclib -undefined dynamic_lookup
+	ifndef ARCH
+		LDFLAGS += -arch x86_64 -arch arm64
+		CFLAGS += -arch x86_64 -arch arm64
+		CURL_CONFIG = --with-secure-transport CFLAGS="-arch x86_64 -arch arm64"
+	else
+		LDFLAGS += -arch $(ARCH)
+		CFLAGS += -arch $(ARCH)
+		CURL_CONFIG = --with-secure-transport CFLAGS="-arch $(ARCH)"
+	endif
+	LDFLAGS += -framework Security -dynamiclib -undefined dynamic_lookup -headerpad_max_install_names
 	T_LDFLAGS = -framework Security
-	CFLAGS += -arch x86_64 -arch arm64
-	CURL_CONFIG = --with-secure-transport CFLAGS="-arch x86_64 -arch arm64"
 	STRIP = strip -x -S $@
 else ifeq ($(PLATFORM),android)
 	ifndef ARCH # Set ARCH to find Android NDK's Clang compiler, the user should set the ARCH
@@ -101,15 +108,15 @@ else ifeq ($(PLATFORM),android)
 else ifeq ($(PLATFORM),ios)
 	TARGET := $(DIST_DIR)/cloudsync.dylib
 	SDK := -isysroot $(shell xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=11.0
-	LDFLAGS += -framework Security -framework CoreFoundation -dynamiclib $(SDK)
+	LDFLAGS += -framework Security -framework CoreFoundation -dynamiclib $(SDK) -headerpad_max_install_names
 	T_LDFLAGS = -framework Security
 	CFLAGS += -arch arm64 $(SDK)
 	CURL_CONFIG = --host=arm64-apple-darwin --with-secure-transport CFLAGS="-arch arm64 -isysroot $$(xcrun --sdk iphoneos --show-sdk-path) -miphoneos-version-min=11.0"
 	STRIP = strip -x -S $@
 else ifeq ($(PLATFORM),ios-sim)
 	TARGET := $(DIST_DIR)/cloudsync.dylib
 	SDK := -isysroot $(shell xcrun --sdk iphonesimulator --show-sdk-path) -miphonesimulator-version-min=11.0
-	LDFLAGS += -arch x86_64 -arch arm64 -framework Security -framework CoreFoundation -dynamiclib $(SDK)
+	LDFLAGS += -arch x86_64 -arch arm64 -framework Security -framework CoreFoundation -dynamiclib $(SDK) -headerpad_max_install_names
 	T_LDFLAGS = -framework Security
 	CFLAGS += -arch x86_64 -arch arm64 $(SDK)
 	CURL_CONFIG = --host=arm64-apple-darwin --with-secure-transport CFLAGS="-arch x86_64 -arch arm64 -isysroot $$(xcrun --sdk iphonesimulator --show-sdk-path) -miphonesimulator-version-min=11.0"