Merge branch 'pull-request/#777-Allow-Building-Tests-as-Submodule-and…

…-GCC-less-than-11' of https://github.com/ETLCPP/etl into pull-request/#777-Allow-Building-Tests-as-Submodule-and-GCC-less-than-11
ETLCPP · Oct 26, 2023 · 95c7f44 · 95c7f44
2 parents 0c1bed0 + c1e9573
commit 95c7f44
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -6,6 +6,7 @@ on:
  branches: [ master, pull-request/*]
 
 jobs:
+
  build-clang-cpp11-linux-stl:
  name: Clang C++11 Linux - STL
  runs-on: ${{ matrix.os }}
@@ -16,6 +17,13 @@ jobs:
  steps:
  - uses: actions/checkout@v3
 
+ # Temporary fix. See https://github.com/actions/runner-images/issues/8659
+ - name: Install newer Clang
+ run: |
+ wget https://apt.llvm.org/llvm.sh
+ chmod +x ./llvm.sh
+ sudo ./llvm.sh 17
+
  - name: Build
  run: |
  export CC=clang

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -360,7 +360,6 @@ endif ()
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
  message(STATUS "Using Clang compiler")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
 endif ()
 
 if ((CMAKE_CXX_COMPILER_ID MATCHES "GNU") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))