ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix clang not building with C++20

This commit is contained in:
Margen67 2025-01-07 21:15:39 -08:00
parent 7437c020d6
commit 6f1cb9e253
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/Linux_build.yml vendored
View File

@ -51,12 +51,8 @@ jobs:
# run: ./xb lint --all # run: ./xb lint --all
build-linux: build-linux:
name: Build (Linux, LLVM ${{ matrix.llvm_version }}) # runner.os can't be used here name: Build (Linux) # runner.os can't be used here
# needs: lint # needs: lint
strategy:
fail-fast: false
matrix:
llvm_version: [15] #[15, 16, 17, 18, 19]
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@main - uses: actions/checkout@main
@ -64,7 +60,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Set environment variables - name: Set environment variables
run: | run: |
LLVM_VERSION=${{ matrix.llvm_version }} LLVM_VERSION=19
echo "LLVM_VERSION=$LLVM_VERSION" >> $GITHUB_ENV echo "LLVM_VERSION=$LLVM_VERSION" >> $GITHUB_ENV
echo "UBUNTU_BASE=jammy" >> $GITHUB_ENV echo "UBUNTU_BASE=jammy" >> $GITHUB_ENV
echo "CC=clang-${LLVM_VERSION}" >> $GITHUB_ENV echo "CC=clang-${LLVM_VERSION}" >> $GITHUB_ENV

1
premake5.lua
View File

@ -140,6 +140,7 @@ filter({"platforms:Linux", "language:C++", "toolset:clang"})
filter({"platforms:Linux", "language:C++", "toolset:clang", "files:*.cc or *.cpp"}) filter({"platforms:Linux", "language:C++", "toolset:clang", "files:*.cc or *.cpp"})
buildoptions({ buildoptions({
"-stdlib=libstdc++", "-stdlib=libstdc++",
"-std=c++20", -- clang doesn't respect cppdialect(?)
}) })
filter("platforms:Android-*") filter("platforms:Android-*")