]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
install-deps: only use gcc-12 on ubuntu jammy for_make_check
authorCasey Bodley <cbodley@redhat.com>
Wed, 5 Nov 2025 23:33:38 +0000 (18:33 -0500)
committerCasey Bodley <cbodley@redhat.com>
Thu, 6 Nov 2025 00:45:17 +0000 (19:45 -0500)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
DISTROS: jammy

install-deps.sh

index 0038673513301633d540f7a57f2dbb5ad1585bb3..51dde57532d9ba13d4bc6b6ecbfcbb70e56c4665 100755 (executable)
@@ -458,7 +458,12 @@ else
                 ;;
             *Jammy*)
                 $SUDO apt-get install -y gcc
-               ensure_decent_gcc_on_ubuntu 12 jammy
+                # libstdc++-12 is needed for clang builds for make check
+                # but ceph-dev-new does not use install-deps.sh, so still builds jammy with gcc-11
+                # ceph-dev-pipeline does use install-deps.sh, which we want to use that same toolchain
+                if $for_make_check; then
+                    ensure_decent_gcc_on_ubuntu 12 jammy
+                fi
                 [ ! $NO_BOOST_PKGS ] && install_boost_on_ubuntu jammy
                 ;;
             *)