Merge pull request #218 from boostorg/azp-gcc-toolchain

AzP: Workaround failure with Clang 11 and add Clang 12-14
boostorg · Nov 4, 2023 · c2c7c19 · c2c7c19
2 parents e9984ff + d2a6940
commit c2c7c19
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -65,8 +65,10 @@ parameters:
       - { compiler: clang-8,   cxxstd: '14,17',    os: ubuntu-20.04 }
       - { compiler: clang-9,   cxxstd: '14,17,2a', os: ubuntu-20.04 }
       - { compiler: clang-10,  cxxstd: '14,17,20', os: ubuntu-20.04 }
-      - { compiler: clang-11,  cxxstd: '14,17,20', os: ubuntu-22.04 }
-      - { compiler: clang-12,  cxxstd: '14,17,20', os: ubuntu-22.04 }
+      - { compiler: clang-11,  cxxstd: '14,17,20', os: ubuntu-20.04 }
+      - { compiler: clang-12,  cxxstd: '14,17,20', os: ubuntu-22.04, gcc_toolchain: 12 }
+      - { compiler: clang-13,  cxxstd: '14,17,20', os: ubuntu-22.04, gcc_toolchain: 12 }
+      - { compiler: clang-14,  cxxstd: '14,17,20', os: ubuntu-22.04, gcc_toolchain: 12 }
       - { name: Linux_clang_6_libcxx,
           compiler: clang-6.0, cxxstd: '11,14,17', os: ubuntu-20.04, container: 'ubuntu:18.04', install: 'clang-6.0 libc++-dev libc++abi-dev', env: {B2_STDLIB: libc++ } }
       # OSX
@@ -109,6 +111,8 @@ stages:
               XCODE_APP: /Applications/Xcode_${{ item.xcode }}.app
             ${{ if item.install }}:
               PACKAGES: ${{ item.install }}
+            ${{ if item.gcc_toolchain }}:
+              GCC_TOOLCHAIN: ${{ item.gcc_toolchain }}
             ${{ each var in item.env }}:
               ${{var.Key}}: ${{var.Value}}
           steps:

diff --git a/ci/azure-pipelines/install.sh b/ci/azure-pipelines/install.sh
@@ -58,6 +58,20 @@ if [ "$AGENT_OS" != "Darwin" ]; then
         sudo apt-get ${NET_RETRY_COUNT:+ -o Acquire::Retries=$NET_RETRY_COUNT} update
         sudo apt-get ${NET_RETRY_COUNT:+ -o Acquire::Retries=$NET_RETRY_COUNT} install -y ${PACKAGES}
     fi
+
+    if [[ -z "$GCC_TOOLCHAIN_ROOT" ]] && [[ -n "$GCC_TOOLCHAIN" ]]; then
+        GCC_TOOLCHAIN_ROOT="$HOME/gcc-toolchain"
+        echo "##vso[task.setvariable variable=GCC_TOOLCHAIN_ROOT]$GCC_TOOLCHAIN_ROOT"
+        if ! command -v dpkg-architecture; then
+            apt-get install -y dpkg-dev
+        fi
+        MULTIARCH_TRIPLET="$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+        mkdir -p "$GCC_TOOLCHAIN_ROOT"
+        ln -s /usr/include "$GCC_TOOLCHAIN_ROOT/include"
+        ln -s /usr/bin "$GCC_TOOLCHAIN_ROOT/bin"
+        mkdir -p "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET"
+        ln -s "/usr/lib/gcc/$MULTIARCH_TRIPLET/$GCC_TOOLCHAIN" "$GCC_TOOLCHAIN_ROOT/lib/gcc/$MULTIARCH_TRIPLET/$GCC_TOOLCHAIN"
+    fi
 fi
 
 old_B2_TOOLSET="$B2_TOOLSET"