From d4c347abe0622dc27ef5fa056dbeab6e2bd0803f Mon Sep 17 00:00:00 2001
From: Nikita Kniazev <kniazev.nikita@gmail.com>
Date: Wed, 1 May 2024 12:30:10 +0300
Subject: [PATCH] CI: Install multilib/32bit libstdc++

---
 .ci/azp-macos-test.yml |  2 +-
 azure-pipelines.yml    | 56 +++++++++++++++++++++---------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.ci/azp-macos-test.yml b/.ci/azp-macos-test.yml
index 1e517948b4..949ce0c850 100644
--- a/.ci/azp-macos-test.yml
+++ b/.ci/azp-macos-test.yml
@@ -20,7 +20,7 @@ steps:
   displayName: Test
 - bash: |
     set -e
-    ./src/engine/b2 b2 warnings-as-errors=on variant=debug,release address-model=32,64 ${TOOLSET:+toolset=$TOOLSET}
+    ./src/engine/b2 b2 warnings-as-errors=on variant=debug,release ${TOOLSET:+toolset=$TOOLSET}
   displayName: "No Warnings"
 - bash: |
     set -e
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7664d0f8f9..2207175189 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -215,17 +215,17 @@ stages:
   - job: 'Linux'
     strategy:
       matrix:
-        GCC 12: {TOOLSET: gcc-12, PACKAGES: g++-12, VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        GCC 11: {TOOLSET: gcc-11, PACKAGES: g++-11, VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        GCC 10: {TOOLSET: gcc-10, PACKAGES: g++-10, VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        GCC 9: {TOOLSET: gcc-9, PACKAGES: g++-9, VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        Clang 16: {TOOLSET: clang-16, PACKAGES: clang-16, LLVM_VER: 16, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        Clang 15: {TOOLSET: clang-15, PACKAGES: clang-15, LLVM_VER: 15, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        Clang 14: {TOOLSET: clang-14, PACKAGES: clang-14, LLVM_VER: 14, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        Clang 13: {TOOLSET: clang-13, PACKAGES: clang-13, LLVM_VER: 13, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        Clang 12: {TOOLSET: clang-12, PACKAGES: clang-12, LLVM_VER: 12, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        Clang 11: {TOOLSET: clang-11, PACKAGES: clang-11, LLVM_VER: 11, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
-        Clang 10: {TOOLSET: clang-10, PACKAGES: clang-10, LLVM_VER: 10, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        GCC 12: {TOOLSET: gcc-12, PACKAGES: g++-12-multilib, VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        GCC 11: {TOOLSET: gcc-11, PACKAGES: g++-11-multilib, VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        GCC 10: {TOOLSET: gcc-10, PACKAGES: g++-10-multilib, VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        GCC 9: {TOOLSET: gcc-9, PACKAGES: g++-9-multilib, VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        Clang 16: {TOOLSET: clang-16, PACKAGES: 'clang-16 libstdc++-12-dev-i386-cross', LLVM_VER: 16, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        Clang 15: {TOOLSET: clang-15, PACKAGES: 'clang-15 libstdc++-11-dev-i386-cross', LLVM_VER: 15, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        Clang 14: {TOOLSET: clang-14, PACKAGES: 'clang-14 libstdc++-11-dev-i386-cross', LLVM_VER: 14, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        Clang 13: {TOOLSET: clang-13, PACKAGES: 'clang-13 libstdc++-11-dev-i386-cross', LLVM_VER: 13, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        Clang 12: {TOOLSET: clang-12, PACKAGES: 'clang-12 libstdc++-11-dev-i386-cross', LLVM_VER: 12, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        Clang 11: {TOOLSET: clang-11, PACKAGES: 'clang-11 libstdc++-11-dev-i386-cross', LLVM_VER: 11, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
+        Clang 10: {TOOLSET: clang-10, PACKAGES: 'clang-10 libstdc++-9-dev-i386-cross', LLVM_VER: 10, LLVM_OS: "${{variables.linux_latest_os}}", VM_IMAGE: "${{variables.linux_latest_vm}}"}
     pool:
       vmImage: $(VM_IMAGE)
     steps:
@@ -234,23 +234,23 @@ stages:
   - job: 'Co_Linux'
     strategy:
       matrix:
-        GCC 8: {CXX: g++-8, TOOLSET: gcc-8, PACKAGES: g++-8, CONTAINER: "ubuntu_1804"}
-        GCC 7: {CXX: g++-7, TOOLSET: gcc-7, PACKAGES: g++-7, CONTAINER: "ubuntu_1804"}
-        GCC 6: {CXX: g++-6, TOOLSET: gcc-6, PACKAGES: g++-6, CONTAINER: "ubuntu_1804"}
-        GCC 5: {CXX: g++-5, TOOLSET: gcc-5, PACKAGES: g++-5, CONTAINER: "ubuntu_1804"}
-        GCC 4.9: {CXX: g++-4.9, TOOLSET: gcc-4.9, PACKAGES: g++-4.9, CONTAINER: "ubuntu_1604"}
-        GCC 4.8: {CXX: g++-4.8, TOOLSET: gcc-4.8, PACKAGES: g++-4.8, CONTAINER: "ubuntu_1804"}
-        GCC 4.7: {CXX: g++-4.7, TOOLSET: gcc-4.7, PACKAGES: g++-4.7, CONTAINER: "ubuntu_1604"}
-        Clang 9: {CXX: clang++-9, TOOLSET: clang-9, PACKAGES: clang-9, LLVM_VER: 9, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
-        Clang 8: {CXX: clang++-8, TOOLSET: clang-8, PACKAGES: clang-8, LLVM_VER: 8, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
-        Clang 7: {CXX: clang++-7, TOOLSET: clang-7, PACKAGES: clang-7, LLVM_VER: 7, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
-        Clang 6: {CXX: clang++-6.0, TOOLSET: clang-6.0, PACKAGES: clang-6.0, LLVM_VER: 6.0, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
-        Clang 5: {CXX: clang++-5.0, TOOLSET: clang-5.0, PACKAGES: clang-5.0, LLVM_VER: 5.0, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
-        Clang 4: {CXX: clang++-4.0, TOOLSET: clang-4.0, PACKAGES: clang-4.0, CONTAINER: "ubuntu_1804"}
-        Clang 3.9: {CXX: clang++-3.9, TOOLSET: clang-3.9, PACKAGES: clang-3.9, CONTAINER: "ubuntu_1804"}
-        Clang 3.8: {CXX: clang++-3.8, TOOLSET: clang-3.8, PACKAGES: clang-3.8, CONTAINER: "ubuntu_1604"}
-        Clang 3.7: {CXX: clang++-3.7, TOOLSET: clang-3.7, PACKAGES: clang-3.7, CONTAINER: "ubuntu_1604"}
-        Clang 3.6: {CXX: clang++-3.6, TOOLSET: clang-3.6, PACKAGES: clang-3.6, CONTAINER: "ubuntu_1604"}
+        GCC 8: {CXX: g++-8, TOOLSET: gcc-8, PACKAGES: g++-8-multilib, CONTAINER: "ubuntu_1804"}
+        GCC 7: {CXX: g++-7, TOOLSET: gcc-7, PACKAGES: g++-7-multilib, CONTAINER: "ubuntu_1804"}
+        GCC 6: {CXX: g++-6, TOOLSET: gcc-6, PACKAGES: g++-6-multilib, CONTAINER: "ubuntu_1804"}
+        GCC 5: {CXX: g++-5, TOOLSET: gcc-5, PACKAGES: g++-5-multilib, CONTAINER: "ubuntu_1804"}
+        GCC 4.9: {CXX: g++-4.9, TOOLSET: gcc-4.9, PACKAGES: g++-4.9-multilib, CONTAINER: "ubuntu_1604"}
+        GCC 4.8: {CXX: g++-4.8, TOOLSET: gcc-4.8, PACKAGES: g++-4.8-multilib, CONTAINER: "ubuntu_1804"}
+        GCC 4.7: {CXX: g++-4.7, TOOLSET: gcc-4.7, PACKAGES: g++-4.7-multilib, CONTAINER: "ubuntu_1604"}
+        Clang 9: {CXX: clang++-9, TOOLSET: clang-9, PACKAGES: 'clang-9 libstdc++-7-dev-i386-cross', LLVM_VER: 9, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
+        Clang 8: {CXX: clang++-8, TOOLSET: clang-8, PACKAGES: 'clang-8 libstdc++-7-dev-i386-cross', LLVM_VER: 8, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
+        Clang 7: {CXX: clang++-7, TOOLSET: clang-7, PACKAGES: 'clang-7 libstdc++-7-dev-i386-cross', LLVM_VER: 7, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
+        Clang 6: {CXX: clang++-6.0, TOOLSET: clang-6.0, PACKAGES: 'clang-6.0 libstdc++-7-dev-i386-cross', LLVM_VER: 6.0, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
+        Clang 5: {CXX: clang++-5.0, TOOLSET: clang-5.0, PACKAGES: 'clang-5.0 libstdc++-7-dev-i386-cross', LLVM_VER: 5.0, LLVM_OS: 'bionic', CONTAINER: "ubuntu_1804"}
+        Clang 4: {CXX: clang++-4.0, TOOLSET: clang-4.0, PACKAGES: 'clang-4.0 libstdc++-7-dev-i386-cross', CONTAINER: "ubuntu_1804"}
+        Clang 3.9: {CXX: clang++-3.9, TOOLSET: clang-3.9, PACKAGES: 'clang-3.9 libstdc++-7-dev-i386-cross', CONTAINER: "ubuntu_1804"}
+        Clang 3.8: {CXX: clang++-3.8, TOOLSET: clang-3.8, PACKAGES: 'clang-3.8 libstdc++-5-dev-i386-cross', CONTAINER: "ubuntu_1604"}
+        Clang 3.7: {CXX: clang++-3.7, TOOLSET: clang-3.7, PACKAGES: 'clang-3.7 libstdc++-5-dev-i386-cross', CONTAINER: "ubuntu_1604"}
+        Clang 3.6: {CXX: clang++-3.6, TOOLSET: clang-3.6, PACKAGES: 'clang-3.6 libstdc++-5-dev-i386-cross', CONTAINER: "ubuntu_1604"}
     pool:
       vmImage: 'ubuntu-20.04'
     container: $[ variables['CONTAINER'] ]