ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2026-04-29 15:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: install gcc before hiding versions, add verification

Browse Source
This commit is contained in:
Nicholas Dudfield
2025-08-18 21:19:27 +07:00
parent 7c4b1bafeb
commit c1a35510f4
1 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
.github/workflows/xahau-ga-nix.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
# - compiler_version: Version number for Conan
# - stdlib: Standard library (libstdcxx/libcxx) for Conan/CMake configuration
# - clang_gcc_toolchain: GCC version for Clang to use (11, 13, 14) when using libstdc++
compiler_id: [clang-14-libstdcxx-gcc11, clang-14-libstdcxx-gcc13, clang-16-libstdcxx-gcc13] # Temporarily disabled: gcc-13-libstdcxx
compiler_id: [clang-14-libstdcxx-gcc11, clang-16-libstdcxx-gcc13] # Temporarily disabled: gcc-13-libstdcxx
configuration: [Debug]
include:
# - compiler_id: gcc-13-libstdcxx
@@ -42,13 +42,6 @@ jobs:
compiler_version: 14
stdlib: libstdcxx # Required for clang-14 compatibility
clang_gcc_toolchain: 11 # Use GCC 11 headers with Clang 14
- compiler_id: clang-14-libstdcxx-gcc13
compiler: clang
cc: clang-14
cxx: clang++-14
compiler_version: 14
stdlib: libstdcxx # Required for clang-14 compatibility
clang_gcc_toolchain: 13 # Use GCC 13 headers with Clang 14 (GCC 14 too new)
- compiler_id: clang-16-libstdcxx-gcc13
compiler: clang
cc: clang-16
@@ -70,32 +63,32 @@ jobs:
sudo apt-get update
sudo apt-get install -y ninja-build ${{ matrix.cc }} ${{ matrix.cxx }} ccache
# For Clang with specific GCC toolchain, hide newer GCC versions
# This is needed for Clang 14 which uses --gcc-toolchain and still picks the highest version
# Install the specific GCC version needed for Clang
if [ -n "${{ matrix.clang_gcc_toolchain }}" ]; then
echo "=== GCC versions present before any changes ==="
ls -la /usr/lib/gcc/x86_64-linux-gnu/ | grep -E "^d"
# Install the target GCC version if not present
echo "=== Ensuring GCC ${{ matrix.clang_gcc_toolchain }} is installed ==="
echo "=== Installing GCC ${{ matrix.clang_gcc_toolchain }} for Clang ==="
sudo apt-get install -y gcc-${{ matrix.clang_gcc_toolchain }} g++-${{ matrix.clang_gcc_toolchain }} libstdc++-${{ matrix.clang_gcc_toolchain }}-dev
if [ "${{ matrix.compiler_version }}" = "14" ]; then
echo "=== Hiding GCC versions newer than ${{ matrix.clang_gcc_toolchain }} for Clang 14 ==="
target_version=${{ matrix.clang_gcc_toolchain }}
counter=1
for dir in /usr/lib/gcc/x86_64-linux-gnu/*/; do
if [ -d "$dir" ]; then
version=$(basename "$dir")
# Check if version is numeric and greater than target
if [[ "$version" =~ ^[0-9]+$ ]] && [ "$version" -gt "$target_version" ]; then
echo "Hiding GCC $version -> renaming to $counter"
sudo mv "$dir" "/usr/lib/gcc/x86_64-linux-gnu/$counter"
counter=$((counter + 1))
fi
echo "=== GCC versions available after installation ==="
ls -la /usr/lib/gcc/x86_64-linux-gnu/ | grep -E "^d"
fi
# For Clang 14 with --gcc-toolchain, hide newer GCC versions
# This is needed because --gcc-toolchain still picks the highest version
if [ -n "${{ matrix.clang_gcc_toolchain }}" ] && [ "${{ matrix.compiler_version }}" = "14" ]; then
echo "=== Hiding GCC versions newer than ${{ matrix.clang_gcc_toolchain }} for Clang 14 ==="
target_version=${{ matrix.clang_gcc_toolchain }}
counter=1
for dir in /usr/lib/gcc/x86_64-linux-gnu/*/; do
if [ -d "$dir" ]; then
version=$(basename "$dir")
# Check if version is numeric and greater than target
if [[ "$version" =~ ^[0-9]+$ ]] && [ "$version" -gt "$target_version" ]; then
echo "Hiding GCC $version -> renaming to $counter"
sudo mv "$dir" "/usr/lib/gcc/x86_64-linux-gnu/$counter"
counter=$((counter + 1))
fi
done
fi
fi
done
fi
# Verify what Clang will use