Skip to content

Commit 77a7c2f

Browse files
Remove libstdc++-13-dev in clang 11-15 CI
This works around these clang versions failing to compile libstdc++ from g++-13.
1 parent bb9ae93 commit 77a7c2f

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,15 @@ jobs:
273273
if: ${{ matrix.install_extra }}
274274
run: |
275275
sudo apt install ${{ matrix.install_extra }}
276+
- name: remove g++-13 to fix old clang builds
277+
if: ${{ matrix.cxx == 'clang++-11' || matrix.cxx == 'clang++-12' || matrix.cxx == 'clang++-13' || matrix.cxx == 'clang++-14' || matrix.cxx == 'clang++-15' }}
278+
run: |
279+
sudo apt remove gcc-13 g++-13 libstdc++-13-dev gcc g++ libstdc++-dev
280+
sudo apt autoremove
281+
# afterwards there are still some files of g++-13 left, and clang still detects it. So remove the directory:
282+
ls -la /usr/lib/gcc/x86_64-linux-gnu/13
283+
sudo rm -rf /usr/lib/gcc/x86_64-linux-gnu/13
284+
sudo apt install g++-12
276285
- name: download CUDA
277286
if: matrix.cuda_url
278287
run: |
@@ -302,6 +311,8 @@ jobs:
302311
CXX_FLAGS+=" -noswitcherror"
303312
fi
304313
314+
$CXX -v
315+
305316
cmake .. -DBUILD_TESTING=ON \
306317
-DLLAMA_BUILD_EXAMPLES=ON \
307318
-DCMAKE_BUILD_TYPE=$CONFIG \
@@ -314,7 +325,10 @@ jobs:
314325
-DCMAKE_CUDA_HOST_COMPILER=$CXX \
315326
-DCMAKE_CXX_FLAGS="$CXX_FLAGS" \
316327
-DCMAKE_CUDA_FLAGS="${{ matrix.cuda_flags }}" \
317-
-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
328+
-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake || true
329+
330+
cat /usr/local/share/vcpkg/buildtrees/detect_compiler/config-x64-linux-rel-out.log || true
331+
cat /usr/local/share/vcpkg/buildtrees/detect_compiler/config-x64-linux-rel-err.log || true
318332
- name: build tests + examples
319333
run: |
320334
if [ ${{ matrix.add_oneapi_repo }} ]; then source /opt/intel/oneapi/setvars.sh; fi

0 commit comments

Comments
 (0)