From 93e48ada83ed5b60be5e51443fd5868bbc54ce08 Mon Sep 17 00:00:00 2001 From: Kyle Shores Date: Sun, 17 Dec 2023 17:24:48 -0600 Subject: [PATCH] trying to use clang-16 on ubuntu --- .github/workflows/ubuntu.yml | 10 +++++++--- CMakeLists.txt | 6 ------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 103d200..2bf34c9 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -35,10 +35,14 @@ jobs: strategy: matrix: build_type: [Release] - env: - CC: clang - CXX: clang++ steps: + - name: Install Clang 16 + run: | + sudo apt-get update + sudo apt-get install -y clang-16 + sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100 + sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100 + - name: Checkout code uses: actions/checkout@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d33b17..21ea52f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,12 +23,6 @@ set(CMAKE_CXX_EXTENSIONS OFF) include(cmake/dependencies.cmake) -# on ubuntu with clang, an incorrect version of the c++ standard library was being linked -if (${CMAKE_HOST_SYSTEM_NAME} MATCHES "Linux" AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - # If the compiler is Clang, use libc++ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++") -endif() - ################################################################################ # targets