Addressing Bot comments

Author: AngelYanev

.github/actions/build-package/action.yml

@@ -83,7 +83,8 @@ runs:
         # Source gcc-toolset environment (version depends on distro)
         if [ -f /etc/profile.d/gcc-toolset-15.sh ]; then
           source /etc/profile.d/gcc-toolset-15.sh
-        # Fallback for Rocky Linux 8/9
+        elif [ -f /etc/profile.d/gcc-toolset-14.sh ]; then
+          source /etc/profile.d/gcc-toolset-14.sh
         elif [ -f /etc/profile.d/gcc-toolset-13.sh ]; then
           source /etc/profile.d/gcc-toolset-13.sh
         fi
@@ -92,10 +93,10 @@ runs:
         export DISABLE_WERRORS=yes
         export BUILD_TLS=yes
         export USE_SYSTEMD=yes
-        # Enable RediSearch LTO only where LLVM 21 is available (Rocky 10).
-        # Rocky 8/9 lack libstdc++ with GLIBCXX_3.4.30+ that upstream LLVM 21
-        # binaries require, so keep LTO=0 there.
-        if [ -x /opt/llvm/bin/clang-21 ]; then
+        # Enable RediSearch LTO only where our LLVM toolchain is installed.
+        # Rocky 8 lacks a compatible libstdc++ runtime for the prebuilt LLVM
+        # binaries so it has no /opt/llvm; Rocky 9 and 10 do.
+        if [ -x /opt/llvm/bin/clang ]; then
           export LTO=1
           export PATH=/opt/llvm/bin:$PATH
         else

dockerfiles/Dockerfile.rockylinux9

@@ -10,8 +10,8 @@ RUN echo '[goreleaser]\nname=GoReleaser\nbaseurl=https://repo.goreleaser.com/yum
     xz \
     wget \
     which \
-    gcc-toolset-13-gcc \
-    gcc-toolset-13-gcc-c++ \
+    gcc-toolset-14-gcc \
+    gcc-toolset-14-gcc-c++ \
     clang \
     git \
     make \
@@ -32,29 +32,15 @@ RUN echo '[goreleaser]\nname=GoReleaser\nbaseurl=https://repo.goreleaser.com/yum
     # Python venv
     python3 -m venv /opt/venv; \
     \
-    cp /opt/rh/gcc-toolset-13/enable /etc/profile.d/gcc-toolset-13.sh; \
-    echo "source /etc/profile.d/gcc-toolset-13.sh" >> /etc/bashrc
+    cp /opt/rh/gcc-toolset-14/enable /etc/profile.d/gcc-toolset-14.sh; \
+    echo "source /etc/profile.d/gcc-toolset-14.sh" >> /etc/bashrc
 
 # Install CMake
 COPY install/install_cmake.sh /tmp/
 RUN bash /tmp/install_cmake.sh
 
-# Rocky 9's system libstdc++ (GCC 11, GLIBCXX_3.4.28) is too old for the
-# prebuilt LLVM 21 binaries (need 3.4.30+). Pull a newer libstdc++ from
-# Fedora 43 which provides GLIBCXX_3.4.34 and is built against a compatible
-RUN dnf install -y \
-    --repofrompath=fedora,'https://dl.fedoraproject.org/pub/fedora/linux/releases/43/Everything/$basearch/os/' \
-    --setopt=fedora.gpgcheck=0 \
-    --disablerepo='*' --enablerepo=fedora \
-    libstdc++ && \
-    dnf clean all
-
-# Install LLVM 21 for RediSearch LTO (Rocky 9 + Rocky 10; see install_llvm.sh).
-COPY install/install_llvm.sh /tmp/
-RUN bash /tmp/install_llvm.sh
-
 # Set environment
-ENV PATH="/opt/llvm/bin:/usr/local/bin:/opt/venv/bin:${PATH}"
+ENV PATH="/usr/local/bin:/opt/venv/bin:${PATH}"
 WORKDIR /build
 
 # Default command

install/install_llvm.sh

@@ -2,9 +2,9 @@
 # Install LLVM 21 for RediSearch's cross-language (C/Rust) LTO build.
 # LLVM has no dnf repo, so we use the official upstream tarball.
 #
-# Rocky 10 only: prebuilt LLVM 21 binaries need GLIBCXX_3.4.30+; Rocky 10
-# ships it (3.4.32). Rocky 8/9 don't — gcc-toolset ships compile-time headers
-# only, no newer libstdc++.so.6 runtime, so there is nothing to vendor.
+# Rocky 10 only: ships libstdc++ with GLIBCXX_3.4.32 which satisfies the
+# GLIBCXX_3.4.30+ requirement of the prebuilt LLVM 21 binaries.
+# Rocky 8 and Rocky 9 are not supported (incompatible libstdc++ at runtime).
 
 set -euo pipefail