Specify OSX architecture

Author: BewareMyPower

.github/workflows/ci-pr-validation.yaml

@@ -55,10 +55,10 @@ jobs:
         run: |
           export PULSAR_DIR=$PWD/pkg/mac/.install
           echo "Build with static library"
-          clang++ win-examples/example.cc -o static.out -std=c++11 -I $PULSAR_DIR/include $PULSAR_DIR/lib/libpulsarwithdeps.a -framework SystemConfiguration -framework CoreFoundation
+          clang++ win-examples/example.cc -o static.out -std=c++11 -arch ${{ matrix.arch }} -I $PULSAR_DIR/include $PULSAR_DIR/lib/libpulsarwithdeps.a -framework SystemConfiguration -framework CoreFoundation
           ./static.out
           echo "Build with dynamic library"
-          clang++ win-examples/example.cc -o dynamic.out -std=c++11 -I $PULSAR_DIR/include -L $PULSAR_DIR/lib -Wl,-rpath $PULSAR_DIR/lib -lpulsar
+          clang++ win-examples/example.cc -o dynamic.out -std=c++11 -arch ${{ matrix.arch }} -I $PULSAR_DIR/include -L $PULSAR_DIR/lib -Wl,-rpath $PULSAR_DIR/lib -lpulsar
           ./dynamic.out
 
       - name: Zip artifact

build-support/merge_archives_vcpkg.sh

@@ -27,6 +27,12 @@ if [[ $# -lt 1 ]]; then
 fi
 
 CMAKE_BUILD_DIRECTORY=$1
-./merge_archives.sh $CMAKE_BUILD_DIRECTORY/libpulsarwithdeps.a \
-    $CMAKE_BUILD_DIRECTORY/lib/libpulsar.a \
-    $(find "$CMAKE_BUILD_DIRECTORY/vcpkg_installed" -name "*.a" | grep -v debug)
+if [[ $VCPKG_TRIPLET ]]; then
+    ./merge_archives.sh $CMAKE_BUILD_DIRECTORY/libpulsarwithdeps.a \
+        $CMAKE_BUILD_DIRECTORY/lib/libpulsar.a \
+        $(find "$CMAKE_BUILD_DIRECTORY/vcpkg_installed/$VCPKG_TRIPLET" -name "*.a" | grep -v debug)
+else
+    ./merge_archives.sh $CMAKE_BUILD_DIRECTORY/libpulsarwithdeps.a \
+        $CMAKE_BUILD_DIRECTORY/lib/libpulsar.a \
+        $(find "$CMAKE_BUILD_DIRECTORY/vcpkg_installed" -name "*.a" | grep -v debug)
+fi

pkg/mac/build-static-library.sh

@@ -18,12 +18,25 @@
 # under the License.
 #
 
-set -ex
+set -e
 cd `dirname $0`/../..
 
+if [[ $ARCH == "x86_64" ]]; then
+    export VCPKG_TRIPLET=x64-osx
+elif [[ $ARCH == "arm64" ]]; then
+    export VCPKG_TRIPLET=arm64-osx
+else
+    echo "Invalid ARCH: $ARCH"
+    exit 1
+fi
+CMAKE_OSX_ARCHITECTURES=$ARCH
+
 INSTALL_DIR=$PWD/pkg/mac/.install
+set -x
 cmake -B build-osx -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
     -DINTEGRATE_VCPKG=ON \
+    -DVCPKG_TARGET_TRIPLET=$VCPKG_TRIPLET \
+    -DCMAKE_OSX_ARCHITECTURES=$CMAKE_OSX_ARCHITECTURES \
     -DCMAKE_BUILD_TYPE=Release \
     -DBUILD_TESTS=OFF \
     -DBUILD_PERF_TOOLS=OFF \