From 85f5404daca70a8bc772c5e0670b22f68ad9d76d Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Mon, 21 Dec 2020 16:27:01 +0100 Subject: [PATCH] ci: gh-actions: clang+libc++ cannot find headers --- .github/workflows/cmake-build-ci.gen | 6 ++---- .github/workflows/cmake-build-ci.yml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen index 9494590b..dd170e3b 100755 --- a/.github/workflows/cmake-build-ci.gen +++ b/.github/workflows/cmake-build-ci.gen @@ -86,13 +86,11 @@ const ENV = [ ], "cur" => [ "CXXFLAGS" => "-stdlib=libc++", - "INSTALL_CXX" => "libc++" - . MAP["env.OS_VER"]["ubuntu-20.04"]["env.CC_VND"]["clang"]["env.CC_VER"]["cur"] . "-dev" + "INSTALL_CXX" => "libc++-9-dev libc++abi-9-dev" ], "old" => [ "CXXFLAGS" => "-stdlib=libc++", - "INSTALL_CXX" => "libc++" - . MAP["env.OS_VER"]["ubuntu-20.04"]["env.CC_VND"]["clang"]["env.CC_VER"]["old"] . "-dev" + "INSTALL_CXX" => "libc++-8-dev libc++abi-8-dev" ], ] ], diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml index 1599bed7..9d9c6a36 100644 --- a/.github/workflows/cmake-build-ci.yml +++ b/.github/workflows/cmake-build-ci.yml @@ -446,14 +446,14 @@ jobs: echo CC="clang-9" >> ${GITHUB_ENV} echo CXX="clang++-9" >> ${GITHUB_ENV} echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV} - echo INSTALL_CXX="libc++-9-dev" >> ${GITHUB_ENV} + echo INSTALL_CXX="libc++-9-dev libc++abi-9-dev" >> ${GITHUB_ENV} - name: Prepare environment (for old clang on ubuntu-20.04) if: (env.OS_VER=='ubuntu-20.04') && (env.CC_VND=='clang') && (env.CC_VER=='old') run: | echo CC="clang-8" >> ${GITHUB_ENV} echo CXX="clang++-8" >> ${GITHUB_ENV} echo CXXFLAGS="-stdlib=libc++" >> ${GITHUB_ENV} - echo INSTALL_CXX="libc++-8-dev" >> ${GITHUB_ENV} + echo INSTALL_CXX="libc++-8-dev libc++abi-8-dev" >> ${GITHUB_ENV} - name: Prepare environment (for new gnu on ubuntu-18.04) if: (env.OS_VER=='ubuntu-18.04') && (env.CC_VND=='gnu') && (env.CC_VER=='new') run: | -- 2.30.2