WIP: Use vku with vcpkg overlays.

stripe2933 · Jul 21, 2024 · 48722e1 · 48722e1
1 parent ba7bbaa
commit 48722e1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/clang-toolchain.cmake b/.github/workflows/clang-toolchain.cmake
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -46,7 +46,6 @@ jobs:
             -DCMAKE_TOOLCHAIN_FILE="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" \
             -DVCPKG_OVERLAY_TRIPLETS=".github/workflows/triplets" \
             -DVCPKG_TARGET_TRIPLET="x64-linux-clang" \
-            -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=".github/workflows/clang-toolchain.cmake" \
             -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
             -DCMAKE_EXE_LINKER_FLAGS="-stdlib=libc++ -lc++abi"
 

diff --git a/.github/workflows/triplets/x64-linux-clang.cmake b/.github/workflows/triplets/x64-linux-clang.cmake
@@ -2,4 +2,6 @@ set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE static)
 set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE .github/workflows/clang-toolchain.cmake)
+
+set(CMAKE_C_COMPILER /usr/bin/clang-18)
+set(CMAKE_CXX_COMPILER /usr/bin/clang++-18)