From 88b890e8cd797405908bc6d53eff4d83f8c758f3 Mon Sep 17 00:00:00 2001
From: Rene Rivera <grafikrobot@gmail.com>
Date: Wed, 27 Apr 2022 09:10:30 -0500
Subject: [PATCH] Add more macOS cross-build checks.

---
 .ci/azp-macos-extra.yml |  7 -------
 azure-pipelines.yml     | 10 +++++++++-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.ci/azp-macos-extra.yml b/.ci/azp-macos-extra.yml
index 04c717635..0bb91513d 100644
--- a/.ci/azp-macos-extra.yml
+++ b/.ci/azp-macos-extra.yml
@@ -5,13 +5,6 @@ steps:
     sudo xcode-select -switch ${XCODE_APP}
     which clang++
   displayName: Install
-- bash: |
-    set -e
-    cd src/engine
-    ./build.sh ${TOOLSET} --cxx=${CXX}
-    ./b2 -v
-    cd ../..
-  displayName: Build
 - bash: |
     set -e
     CXX_PATH=`which ${CXX}`
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4b2683f11..9213599a1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -125,10 +125,18 @@ stages:
   - job: 'macOS'
     strategy:
       matrix:
-        Xcode ${{variables.xc_latest}}: {
+        Xcode ${{variables.xc_latest}} arm+x86/64: {
           B2_ARGS: "architecture=arm+x86 address-model=64",
           TOOLSET: clang, TEST_TOOLSET: clang, CXX: clang++,
           XCODE_APP: "/Applications/Xcode_${{variables.xc_latest}}.app", VM_IMAGE: "${{variables.macos_latest_vm}}"}
+        Xcode ${{variables.xc_latest}} arm/64: {
+          B2_ARGS: "architecture=arm address-model=64",
+          TOOLSET: clang, TEST_TOOLSET: clang, CXX: clang++,
+          XCODE_APP: "/Applications/Xcode_${{variables.xc_latest}}.app", VM_IMAGE: "${{variables.macos_latest_vm}}"}
+        Xcode ${{variables.xc_latest}} x86/64: {
+          B2_ARGS: "architecture=x86 address-model=64",
+          TOOLSET: clang, TEST_TOOLSET: clang, CXX: clang++,
+          XCODE_APP: "/Applications/Xcode_${{variables.xc_latest}}.app", VM_IMAGE: "${{variables.macos_latest_vm}}"}
     pool:
       vmImage: $(VM_IMAGE)
     steps: